---

yaml --- r: 344688 b: refs/heads/master c: 8b09551 h: refs/heads/master v: v3
git-mirror · Dec 7, 2012 · 65057a3 · 65057a3
1 parent e6df07c
commit 65057a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)