summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorRichard Röjfors <richard.rojfors@gmail.com>2013-10-03 20:45:19 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-10-09 11:42:41 +0200
commit7831b2ae4a348144be95ccac49d67aa54d6f0dc0 (patch)
treef8a1ded50ad507d59ff6c76a5b5fd7e66c197f2c /drivers/video
parentomapdss: HDMI: move common functions to a separate file (diff)
downloadlinux-7831b2ae4a348144be95ccac49d67aa54d6f0dc0.tar.xz
linux-7831b2ae4a348144be95ccac49d67aa54d6f0dc0.zip
OMAPDSS: HDMI: Correctly compare timings
There is currently a copy and paste error where the hdmi vsync timings are not compared correctly, this patch fixes this. Signed-off-by: Richard Röjfors <richard.rojfors@gmail.com> [tomi.valkeinen@ti.com: fixed to apply on top of latest tree] Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/hdmi_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/hdmi_common.c b/drivers/video/omap2/dss/hdmi_common.c
index 6f727c858857..5586aaad9d63 100644
--- a/drivers/video/omap2/dss/hdmi_common.c
+++ b/drivers/video/omap2/dss/hdmi_common.c
@@ -283,7 +283,7 @@ static bool hdmi_timings_compare(struct omap_video_timings *timing1,
timing2_hsync = timing2->hfp + timing2->hsw + timing2->hbp;
timing1_hsync = timing1->hfp + timing1->hsw + timing1->hbp;
timing2_vsync = timing2->vfp + timing2->vsw + timing2->vbp;
- timing1_vsync = timing2->vfp + timing2->vsw + timing2->vbp;
+ timing1_vsync = timing1->vfp + timing1->vsw + timing1->vbp;
DSSDBG("timing1_hsync = %d timing1_vsync = %d"\
"timing2_hsync = %d timing2_vsync = %d\n",