diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /drivers/acpi/battery.c | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 6e5221707d97..9810e2a55d0a 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -757,6 +757,9 @@ static int __init acpi_battery_init(void) | |||
| 757 | { | 757 | { |
| 758 | int result; | 758 | int result; |
| 759 | 759 | ||
| 760 | if (acpi_disabled) | ||
| 761 | return -ENODEV; | ||
| 762 | |||
| 760 | acpi_battery_dir = acpi_lock_battery_dir(); | 763 | acpi_battery_dir = acpi_lock_battery_dir(); |
| 761 | if (!acpi_battery_dir) | 764 | if (!acpi_battery_dir) |
| 762 | return -ENODEV; | 765 | return -ENODEV; |