git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pull asus sony thinkpad into release branch
[safe/jmp/linux-2.6]
/
drivers
/
acpi
/
cm_sbs.c
diff --git
a/drivers/acpi/cm_sbs.c
b/drivers/acpi/cm_sbs.c
index
a01ce67
..
f9db4f4
100644
(file)
--- a/
drivers/acpi/cm_sbs.c
+++ b/
drivers/acpi/cm_sbs.c
@@
-31,7
+31,7
@@
#include <acpi/actypes.h>
#include <acpi/acutils.h>
#include <acpi/actypes.h>
#include <acpi/acutils.h>
-ACPI_MODULE_NAME("cm_sbs")
+ACPI_MODULE_NAME("cm_sbs")
;
#define ACPI_AC_CLASS "ac_adapter"
#define ACPI_BATTERY_CLASS "battery"
#define ACPI_SBS_COMPONENT 0x00080000
#define ACPI_AC_CLASS "ac_adapter"
#define ACPI_BATTERY_CLASS "battery"
#define ACPI_SBS_COMPONENT 0x00080000
@@
-67,7
+67,7
@@
void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir_param)
lock_ac_dir_cnt--;
if (lock_ac_dir_cnt == 0 && acpi_ac_dir_param && acpi_ac_dir) {
remove_proc_entry(ACPI_AC_CLASS, acpi_root_dir);
lock_ac_dir_cnt--;
if (lock_ac_dir_cnt == 0 && acpi_ac_dir_param && acpi_ac_dir) {
remove_proc_entry(ACPI_AC_CLASS, acpi_root_dir);
- acpi_ac_dir =
0
;
+ acpi_ac_dir =
NULL
;
}
mutex_unlock(&cm_sbs_mutex);
}
}
mutex_unlock(&cm_sbs_mutex);
}
@@
-99,7
+99,7
@@
void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir_param)
if (lock_battery_dir_cnt == 0 && acpi_battery_dir_param
&& acpi_battery_dir) {
remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);
if (lock_battery_dir_cnt == 0 && acpi_battery_dir_param
&& acpi_battery_dir) {
remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);
- acpi_battery_dir =
0
;
+ acpi_battery_dir =
NULL
;
}
mutex_unlock(&cm_sbs_mutex);
return;
}
mutex_unlock(&cm_sbs_mutex);
return;