From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 6 Dec 2010 07:04:24 +0000 (+0800)
Subject: ACPI video: check cap._DDC flag before getting EDID
X-Git-Tag: v2.6.38-rc1~68^2~12^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=82069552555cf951d9ade5c1aec61dd40b0765b5;p=linux.git

ACPI video: check cap._DDC flag before getting EDID

cap._DDC is defined but never used.
Check this flag now and don't try to get EDID for video output devices with this flag cleared.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 81766ebec843..177b4ddc3479 100644
--- a/drivers/acpi/video.c
+++ b/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: