From f5ef763f34c74c201d489548612d16c6234b3958 Mon Sep 17 00:00:00 2001
From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 6 Dec 2010 15:04:24 +0800
Subject: [PATCH] --- yaml --- r: 230931 b: refs/heads/master c:
 82069552555cf951d9ade5c1aec61dd40b0765b5 h: refs/heads/master i:   230929:
 a40b44ad8758436e23e01259c830815be5b30f7b   230927:
 088ee418d0358243453ac7e96a6f42b6d3b33a06 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/acpi/video.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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: