Merge tag 'v3.10-rc2' into drm-intel-next-queued

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_opregion.c

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 62b64e4877b8b9a5b5764d987936c37559d40739..5c2d6939600e553998ed41fbfa3ed9001fe07002 100644 (file)
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -293,11 +293,11 @@ static void intel_didl_outputs(struct drm_device *dev)
        if (!handle || acpi_bus_get_device(handle, &acpi_dev))
                return;
 
-       if (acpi_is_video_device(acpi_dev))
+       if (acpi_is_video_device(handle))
                acpi_video_bus = acpi_dev;
        else {
                list_for_each_entry(acpi_cdev, &acpi_dev->children, node) {
-                       if (acpi_is_video_device(acpi_cdev)) {
+                       if (acpi_is_video_device(acpi_cdev->handle)) {
                                acpi_video_bus = acpi_cdev;
                                break;
                        }