summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2010-12-06 15:04:24 +0800
committerLen Brown <len.brown@intel.com>2010-12-14 00:04:59 -0500
commit82069552555cf951d9ade5c1aec61dd40b0765b5 (patch)
tree60cccea9bbd82d49dea6be1fcba5453911e12482 /drivers/acpi
parent677bd810eedce61edf15452491781ff046b92edc (diff)
downloadop-kernel-dev-82069552555cf951d9ade5c1aec61dd40b0765b5.zip
op-kernel-dev-82069552555cf951d9ade5c1aec61dd40b0765b5.tar.gz
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')
-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 81766eb..177b4ddc 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:
OpenPOWER on IntegriCloud