From: Andrew Morton <akpm@osdl.org>

Cc: Jiri Kosina <jikos@jikos.cz>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/acpi/battery.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff -puN drivers/acpi/battery.c~acpi-preserve-correct-battery-state-through-suspend-resume-cycles-tidy drivers/acpi/battery.c
--- a/drivers/acpi/battery.c~acpi-preserve-correct-battery-state-through-suspend-resume-cycles-tidy
+++ a/drivers/acpi/battery.c
@@ -763,9 +763,8 @@ static int acpi_battery_resume(struct ac
 	if (!device)
 		return -EINVAL;
 
-	battery = (struct acpi_battery *)device->driver_data;
+	battery = device->driver_data;
 	return acpi_battery_check(battery);
-
 }
 
 static int __init acpi_battery_init(void)
_