aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/video.c
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2010-12-06 02:04:24 -0500
committerLen Brown <len.brown@intel.com>2010-12-14 00:04:59 -0500
commit82069552555cf951d9ade5c1aec61dd40b0765b5 (patch)
tree60cccea9bbd82d49dea6be1fcba5453911e12482 /drivers/acpi/video.c
parent677bd810eedce61edf15452491781ff046b92edc (diff)
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>
Diffstat (limited to 'drivers/acpi/video.c')
-rw-r--r--drivers/acpi/video.c3
1 files changed, 3 insertions, 0 deletions
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,
1275 if (!video_device) 1275 if (!video_device)
1276 continue; 1276 continue;
1277 1277
1278 if (!video_device->cap._DDC)
1279 continue;
1280
1278 if (type) { 1281 if (type) {
1279 switch (type) { 1282 switch (type) {
1280 case ACPI_VIDEO_DISPLAY_CRT: 1283 case ACPI_VIDEO_DISPLAY_CRT: