diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
| commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
| tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/power.c | |
| parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
| parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
| download | linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.gz linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.bz2 linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.zip | |
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 4 |
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) strcpy(resource->name, device->pnp.bus_id); strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_POWER_CLASS); - acpi_driver_data(device) = resource; + device->driver_data = resource; /* Evalute the object to get the system level and resource order. */ status = acpi_evaluate_object(device->handle, NULL, NULL, &buffer); @@ -755,7 +755,7 @@ static int acpi_power_resume(struct acpi_device *device) if (!device || !acpi_driver_data(device)) return -EINVAL; - resource = (struct acpi_power_resource *)acpi_driver_data(device); + resource = acpi_driver_data(device); result = acpi_power_get_state(device->handle, &state); if (result) |