summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-04-03 09:10:33 +1000
committerDave Airlie <airlied@redhat.com>2009-04-03 09:10:33 +1000
commit16456c872e4e3d674dde73f9bdf3f69c0d95e070 (patch)
tree6a2241babb9703a435f3462cea7a5f3486cf6f65 /drivers/gpu
parent3c6fc3521acbee33637e7db803ac3cf3b0e2ff04 (diff)
downloadkernel-crypto-16456c872e4e3d674dde73f9bdf3f69c0d95e070.tar.gz
kernel-crypto-16456c872e4e3d674dde73f9bdf3f69c0d95e070.tar.xz
kernel-crypto-16456c872e4e3d674dde73f9bdf3f69c0d95e070.zip
drm: fix typo in edid vendor parsing.
Should be, edid_vendor[2] = (edid->mfg_id[1] & 0x1f) + '@'; Since vendor ID has only two bytes only, I am somewhat surprised why gcc doesn't complain this. Reported-by: Guo, Chaohong <chaohong.guo@intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_edid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index c67400067b8..2c4a340e682 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -162,7 +162,7 @@ static bool edid_vendor(struct edid *edid, char *vendor)
edid_vendor[0] = ((edid->mfg_id[0] & 0x7c) >> 2) + '@';
edid_vendor[1] = (((edid->mfg_id[0] & 0x3) << 3) |
((edid->mfg_id[1] & 0xe0) >> 5)) + '@';
- edid_vendor[2] = (edid->mfg_id[2] & 0x1f) + '@';
+ edid_vendor[2] = (edid->mfg_id[1] & 0x1f) + '@';
return !strncmp(edid_vendor, vendor, 3);
}