diff --git a/[refs] b/[refs] index 0db463b85f53..21c496290fd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 677bd810eedce61edf15452491781ff046b92edc +refs/heads/master: 82069552555cf951d9ade5c1aec61dd40b0765b5 diff --git a/trunk/drivers/acpi/video.c b/trunk/drivers/acpi/video.c index 81766ebec843..177b4ddc3479 100644 --- a/trunk/drivers/acpi/video.c +++ b/trunk/drivers/acpi/video.c @@ -1275,6 +1275,9 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, if (!video_device) continue; + if (!video_device->cap._DDC) + continue; + if (type) { switch (type) { case ACPI_VIDEO_DISPLAY_CRT: