diff options
| author | Haley Teng <hteng@nvidia.com> | 2012-01-31 17:27:57 +0800 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-02-16 06:44:47 -0800 |
| commit | 94387e38ba0845643935cda2ddd6e22c498698b8 (patch) | |
| tree | eba0bed7e61778fb431a6f3e7f943e631b64a443 | |
| parent | d372efbc14f87b857823dab785331ca94084f2cf (diff) | |
video: fbmon: correct an improper error handling in fb_edid_add_monspecs()
There could be an EDID which does not contain any or valid "detailed
timing description".
bug 929621
bug 929632
Change-Id: Ib2ade57537e0dbb2263e9b7b1b91432a799743a7
Signed-off-by: Haley Teng <hteng@nvidia.com>
Change-Id: I7139db34c3e2102a2bf08f0ef153cd3f71ddc5d1
Reviewed-on: http://git-master/r/83687
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
| -rw-r--r-- | drivers/video/fbmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index f3fa4469dedc..62dd32b39aac 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c @@ -1003,7 +1003,7 @@ void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs) return; if (edid[0] != 0x2 || - edid[2] < 4 || edid[2] > 128 - DETAILED_TIMING_DESCRIPTION_SIZE) + edid[2] < 4 || edid[2] > 128) return; DPRINTK(" Short Video Descriptors\n"); |