From 65057a34528841a6e16e83690fbdc34d56c8221c Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 24 Oct 2012 13:27:02 +0300 Subject: [PATCH] --- yaml --- r: 344688 b: refs/heads/master c: 8b09551338dbe1882d3d52dcc5d34ef933adbccf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dpi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b239caf37b0d..f900e41d7432 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9b719b6c25c0609c528ccc1e881b42373ba1ba3 +refs/heads/master: 8b09551338dbe1882d3d52dcc5d34ef933adbccf diff --git a/trunk/drivers/video/omap2/dss/dpi.c b/trunk/drivers/video/omap2/dss/dpi.c index d5bc47a4f3ee..6cbcc81991a1 100644 --- a/trunk/drivers/video/omap2/dss/dpi.c +++ b/trunk/drivers/video/omap2/dss/dpi.c @@ -315,7 +315,7 @@ int dpi_check_timings(struct omap_dss_device *dssdev, unsigned long pck; struct dispc_clock_info dispc_cinfo; - if (dss_mgr_check_timings(mgr, timings)) + if (mgr && !dispc_mgr_timings_ok(mgr->id, timings)) return -EINVAL; if (timings->pixel_clock == 0)