X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Facpi%2Fbattery.c;h=9810e2a55d0adf3fb77758b20b9b670f3e2f5342;hb=e30fdb1e026c2d05f216d2e5a25bfafdfd261ec2;hp=6e5221707d9757de15030edb0a08f1d8caa7c89f;hpb=826adfe49a508f15943ce9140a3fc7f6c7661509;p=powerpc.git

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 6e5221707d..9810e2a55d 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -757,6 +757,9 @@ static int __init acpi_battery_init(void)
 {
 	int result;
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	acpi_battery_dir = acpi_lock_battery_dir();
 	if (!acpi_battery_dir)
 		return -ENODEV;