Merge branch 'acpi-dev'

[sfrench/cifs-2.6.git] / drivers / spi / spi.c

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 32c01e684af3def8852414bf11e517ae10030340..30e82f96863916ff8ba348d18d38384512dbd932 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -4374,7 +4374,7 @@ static int acpi_spi_notify(struct notifier_block *nb, unsigned long value,
 
        switch (value) {
        case ACPI_RECONFIG_DEVICE_ADD:
-               ctlr = acpi_spi_find_controller_by_adev(adev->parent);
+               ctlr = acpi_spi_find_controller_by_adev(acpi_dev_parent(adev));
                if (!ctlr)
                        break;