| commit | b20d2aeb0ad322cbe7fd9120acae6118231b17a3 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Tue Aug 15 23:21:37 2006 -0400 |
| committer | Len Brown <len.brown@intel.com> | Tue Aug 15 23:21:37 2006 -0400 |
| tree | c74ff2ae136371b83a673c0aaf297cdc609e1b80 | |
| parent | 4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe [diff] [blame] |
ACPI: skip smart battery init when acpi=off Signed-off-by: Len Brown <len.brown@intel.com>
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index db7b350..62bef0b 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c
@@ -1714,6 +1714,9 @@ { int result = 0; + if (acpi_disabled) + return -ENODEV; + init_MUTEX(&sbs_sem); if (capacity_mode != DEF_CAPACITY_UNIT