---

yaml --- r: 230931 b: refs/heads/master c: 8206955 h: refs/heads/master i: 230929: a40b44a 230927: 088ee41 v: v3
git-mirror · Dec 14, 2010 · f5ef763 · f5ef763
1 parent fbcdd29
commit f5ef763
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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: