diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-16 14:34:52 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-16 14:34:52 -0800 |
commit | 309b51e87905e8a52060dbbab1e427552d5dda9a (patch) | |
tree | 891aaefe5d347de1b3b1b233fa62b9e576b4e096 /drivers/acpi/glue.c | |
parent | 3a55fb0d9fe8e2f4594329edd58c5fd6f35a99dd (diff) | |
parent | 8aef33a7cf40ca9da188e8578b2abe7267a38c52 (diff) | |
download | op-kernel-dev-309b51e87905e8a52060dbbab1e427552d5dda9a.zip op-kernel-dev-309b51e87905e8a52060dbbab1e427552d5dda9a.tar.gz |
Merge tag 'pm+acpi-for-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management fixes from Rafael Wysocki:
- cpuidle regression fix related to the initialization of state
kobjects from Krzysztof Mazur.
- cpuidle fix removing some not very useful code and making some
user-visible problems go away at the same time. From Daniel Lezcano.
- ACPI build fix from Yinghai Lu.
* tag 'pm+acpi-for-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpuidle: remove the power_specified field in the driver
ACPI / glue: Fix build with ACPI_GLUE_DEBUG set
cpuidle: fix number of initialized/destroyed states
Diffstat (limited to 'drivers/acpi/glue.c')
-rw-r--r-- | drivers/acpi/glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 95af6f6..35da181 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -297,7 +297,7 @@ static int acpi_platform_notify(struct device *dev) if (!ret) { struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; - acpi_get_name(dev->acpi_handle, ACPI_FULL_PATHNAME, &buffer); + acpi_get_name(ACPI_HANDLE(dev), ACPI_FULL_PATHNAME, &buffer); DBG("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer); kfree(buffer.pointer); } else |