From: Len Brown <len.brown@intel.com>
Date: Wed, 16 Aug 2006 03:21:37 +0000 (-0400)
Subject: ACPI: skip smart battery init when acpi=off
X-Git-Tag: v2.6.18-rc5~75^3~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b20d2aeb0ad322cbe7fd9120acae6118231b17a3;p=linux-2.6

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 db7b350a50..62bef0b3b6 100644
--- 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