aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-10-22 23:28:38 -0400
committerLen Brown <len.brown@intel.com>2008-10-22 23:28:38 -0400
commit5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch)
tree1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/power.c
parent530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff)
parente3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff)
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r--drivers/acpi/power.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 7ff7349c0c52..e88edc008668 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -679,7 +679,7 @@ static int acpi_power_add(struct acpi_device *device)
679 strcpy(resource->name, device->pnp.bus_id); 679 strcpy(resource->name, device->pnp.bus_id);
680 strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME); 680 strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);
681 strcpy(acpi_device_class(device), ACPI_POWER_CLASS); 681 strcpy(acpi_device_class(device), ACPI_POWER_CLASS);
682 acpi_driver_data(device) = resource; 682 device->driver_data = resource;
683 683
684 /* Evalute the object to get the system level and resource order. */ 684 /* Evalute the object to get the system level and resource order. */
685 status = acpi_evaluate_object(device->handle, NULL, NULL, &buffer); 685 status = acpi_evaluate_object(device->handle, NULL, NULL, &buffer);
@@ -755,7 +755,7 @@ static int acpi_power_resume(struct acpi_device *device)
755 if (!device || !acpi_driver_data(device)) 755 if (!device || !acpi_driver_data(device))
756 return -EINVAL; 756 return -EINVAL;
757 757
758 resource = (struct acpi_power_resource *)acpi_driver_data(device); 758 resource = acpi_driver_data(device);
759 759
760 result = acpi_power_get_state(device->handle, &state); 760 result = acpi_power_get_state(device->handle, &state);
761 if (result) 761 if (result)