---

yaml
---
r: 31999
b: refs/heads/master
c: a6ba5eb
h: refs/heads/master
i:
  31997: e8bbd09
  31995: 89100df
  31991: da2b90a
  31983: f0a16c6
  31967: c5caf26
  31935: 6e96dad
  31871: 2ab77a8
  31743: 8db48ef
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6afa0de1476290a876dfd1237a97cce7735581c
+refs/heads/master: a6ba5ebef91a59fabd45962e576c02468dbcd33f

trunk/drivers/acpi/ac.c

@@ -89,7 +89,7 @@ static int acpi_ac_get_state(struct acpi_ac *ac)
 	if (!ac)
 		return -EINVAL;
 
-	status = acpi_evaluate_integer(ac->handle, "_PSR", NULL, &ac->state);
+	status = acpi_evaluate_integer(ac->device->handle, "_PSR", NULL, &ac->state);
 	if (ACPI_FAILURE(status)) {
 		ACPI_EXCEPTION((AE_INFO, status, "Error reading AC Adapter state"));
 		ac->state = ACPI_AC_STATUS_UNKNOWN;
@@ -236,7 +236,7 @@ static int acpi_ac_add(struct acpi_device *device)
 	if (result)
 		goto end;
 
-	status = acpi_install_notify_handler(ac->handle,
+	status = acpi_install_notify_handler(device->handle,
 					     ACPI_DEVICE_NOTIFY, acpi_ac_notify,
 					     ac);
 	if (ACPI_FAILURE(status)) {
@@ -268,7 +268,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type)
 
 	ac = (struct acpi_ac *)acpi_driver_data(device);
 
-	status = acpi_remove_notify_handler(ac->handle,
+	status = acpi_remove_notify_handler(device->handle,
 					    ACPI_DEVICE_NOTIFY, acpi_ac_notify);
 
 	acpi_ac_remove_fs(device);