drm/radeon: protect ACPI calls with CONFIG_ACPI

[karo-tx-linux.git] / drivers / gpu / drm / radeon / radeon_irq_kms.c

diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index 081886b0642da479033bdc1937b0fdbc8480eb5c..cc9e8482cf30d47be57b9fcb8022ebc7d2c9917e 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -275,17 +275,19 @@ int radeon_irq_kms_init(struct radeon_device *rdev)
                        dev_info(rdev->dev, "radeon: using MSI.\n");
                }
        }
+
+       INIT_WORK(&rdev->hotplug_work, radeon_hotplug_work_func);
+       INIT_WORK(&rdev->audio_work, r600_audio_update_hdmi);
+       INIT_WORK(&rdev->reset_work, radeon_irq_reset_work_func);
+
        rdev->irq.installed = true;
        r = drm_irq_install(rdev->ddev);
        if (r) {
                rdev->irq.installed = false;
+               flush_work(&rdev->hotplug_work);
                return r;
        }
 
-       INIT_WORK(&rdev->hotplug_work, radeon_hotplug_work_func);
-       INIT_WORK(&rdev->audio_work, r600_audio_update_hdmi);
-       INIT_WORK(&rdev->reset_work, radeon_irq_reset_work_func);
-
        DRM_INFO("radeon: irq initialized.\n");
        return 0;
 }