projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d8316d
)
ACPI: skip smart battery init when acpi=off
author
Len Brown
<len.brown@intel.com>
Wed, 16 Aug 2006 03:21:37 +0000
(23:21 -0400)
committer
Len Brown
<len.brown@intel.com>
Wed, 16 Aug 2006 03:21:37 +0000
(23:21 -0400)
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/sbs.c
patch
|
blob
|
history
diff --git
a/drivers/acpi/sbs.c
b/drivers/acpi/sbs.c
index
db7b350
..
62bef0b
100644
(file)
--- a/
drivers/acpi/sbs.c
+++ b/
drivers/acpi/sbs.c
@@
-1714,6
+1714,9
@@
static int __init acpi_sbs_init(void)
{
int result = 0;
+ if (acpi_disabled)
+ return -ENODEV;
+
init_MUTEX(&sbs_sem);
if (capacity_mode != DEF_CAPACITY_UNIT