Merge branches 'acpi-ec', 'acpi-ac', 'acpi-fan', 'acpi-video' and 'acpi-amba'

[linux.git] / drivers / acpi / acpi_amba.c

diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c
index ab8a4e0191b19c9ff5a87e8cb9c47b11cc51bc59..f5b443ab01c2a83c394745a82754058f006a72da 100644 (file)
--- a/drivers/acpi/acpi_amba.c
+++ b/drivers/acpi/acpi_amba.c
@@ -21,6 +21,7 @@
 
 static const struct acpi_device_id amba_id_list[] = {
        {"ARMH0061", 0}, /* PL061 GPIO Device */
+       {"ARMH0330", 0}, /* ARM DMA Controller DMA-330 */
        {"ARMHC500", 0}, /* ARM CoreSight ETM4x */
        {"ARMHC501", 0}, /* ARM CoreSight ETR */
        {"ARMHC502", 0}, /* ARM CoreSight STM */
@@ -48,6 +49,7 @@ static void amba_register_dummy_clk(void)
 static int amba_handler_attach(struct acpi_device *adev,
                                const struct acpi_device_id *id)
 {
+       struct acpi_device *parent = acpi_dev_parent(adev);
        struct amba_device *dev;
        struct resource_entry *rentry;
        struct list_head resource_list;
@@ -97,8 +99,8 @@ static int amba_handler_attach(struct acpi_device *adev,
         * attached to it, that physical device should be the parent of
         * the amba device we are about to create.
         */
-       if (adev->parent)
-               dev->dev.parent = acpi_get_first_physical_node(adev->parent);
+       if (parent)
+               dev->dev.parent = acpi_get_first_physical_node(parent);
 
        ACPI_COMPANION_SET(&dev->dev, adev);