diff options
| author | Len Brown <len.brown@intel.com> | 2006-08-15 23:21:37 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-08-15 23:21:37 -0400 |
| commit | b20d2aeb0ad322cbe7fd9120acae6118231b17a3 (patch) | |
| tree | c74ff2ae136371b83a673c0aaf297cdc609e1b80 /drivers/acpi | |
| parent | 4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe (diff) | |
ACPI: skip smart battery init when acpi=off
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/sbs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index db7b350a5035..62bef0b3b614 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
| @@ -1714,6 +1714,9 @@ static int __init acpi_sbs_init(void) | |||
| 1714 | { | 1714 | { |
| 1715 | int result = 0; | 1715 | int result = 0; |
| 1716 | 1716 | ||
| 1717 | if (acpi_disabled) | ||
| 1718 | return -ENODEV; | ||
| 1719 | |||
| 1717 | init_MUTEX(&sbs_sem); | 1720 | init_MUTEX(&sbs_sem); |
| 1718 | 1721 | ||
| 1719 | if (capacity_mode != DEF_CAPACITY_UNIT | 1722 | if (capacity_mode != DEF_CAPACITY_UNIT |