From 5c4fc192db4a00f58a4082fe4af38c9775322eec Mon Sep 17 00:00:00 2001
From: Patrick Mochel <mochel@linux.intel.com>
Date: Fri, 19 May 2006 16:54:39 -0400
Subject: [PATCH] --- yaml --- r: 31993 b: refs/heads/master c:
 145def84a177c01cf3cc6cfbb67a029f39a8ac35 h: refs/heads/master i:   31991:
 da2b90adb690dfacd739b706d3528f243563a709 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/acpi/battery.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ecf2cb073644..51e1b109fea9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b74863df5d46f794052b5ee010cfc8fd66819dd
+refs/heads/master: 145def84a177c01cf3cc6cfbb67a029f39a8ac35
diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c
index 00b0728efe82..ba34ca611d71 100644
--- a/trunk/drivers/acpi/battery.c
+++ b/trunk/drivers/acpi/battery.c
@@ -109,6 +109,7 @@ struct acpi_battery_trips {
 
 struct acpi_battery {
 	acpi_handle handle;
+	struct acpi_device * device;
 	struct acpi_battery_flags flags;
 	struct acpi_battery_trips trips;
 	unsigned long alarm;
@@ -278,9 +279,7 @@ static int acpi_battery_check(struct acpi_battery *battery)
 	if (!battery)
 		return -EINVAL;
 
-	result = acpi_bus_get_device(battery->handle, &device);
-	if (result)
-		return result;
+	device = battery->device;
 
 	result = acpi_bus_get_status(device);
 	if (result)
@@ -662,8 +661,7 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
 	if (!battery)
 		return;
 
-	if (acpi_bus_get_device(handle, &device))
-		return;
+	device = battery->device;
 
 	switch (event) {
 	case ACPI_BATTERY_NOTIFY_STATUS:
@@ -696,6 +694,7 @@ static int acpi_battery_add(struct acpi_device *device)
 	memset(battery, 0, sizeof(struct acpi_battery));
 
 	battery->handle = device->handle;
+	battery->device = device;
 	strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
 	strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
 	acpi_driver_data(device) = battery;