From: Len Brown Date: Thu, 23 Oct 2008 03:28:38 +0000 (-0400) Subject: Merge branch 'misc' into test X-Git-Tag: v2.6.28-rc1~26^2~14 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5f50ef453dcb05115fc98f244b8f10bfacd4b8b7;p=linux-2.6-omap-h63xx.git Merge branch 'misc' into test --- 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 diff --cc drivers/acpi/power.c index 7ff7349c0c5,1bef9429189..e88edc00866 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@@ -755,9 -733,9 +755,9 @@@ static int acpi_power_resume(struct acp 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(resource, &state); + result = acpi_power_get_state(device->handle, &state); if (result) return result;