diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-04 15:40:59 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-04 15:40:59 (GMT) |
| commit | fc1a7fe8b6442a941a8af0cdcc9ff6b666707d60 (patch) | |
| tree | 72b1eb004577e84a563c16e5acbc8126794e772c /drivers/spi/spi.c | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| parent | e66cd5372d09d58002b2779a3bcdc564d6348883 (diff) | |
| download | linux-fsl-qoriq-fc1a7fe8b6442a941a8af0cdcc9ff6b666707d60.tar.xz | |
Merge branch 'acpi-fixes' into fixes
* acpi-fixes:
ACPI / BGRT: Don't let users configure BGRT on non X86 systems
cpuidle / ACPI: recover percpu ACPI processor cstate
ACPI / I2C: Use parent's ACPI_HANDLE() in acpi_i2c_register_devices()
ACPI / SPI: Use parent's ACPI_HANDLE() in acpi_register_spi_devices()
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index f996c60..5e073d8 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -984,7 +984,7 @@ static void acpi_register_spi_devices(struct spi_master *master) acpi_status status; acpi_handle handle; - handle = ACPI_HANDLE(&master->dev); + handle = ACPI_HANDLE(master->dev.parent); if (!handle) return; |