---

yaml --- r: 196755 b: refs/heads/master c: 279fcd4 h: refs/heads/master i: 196753: 8e4bac7 196751: 4a93886 v: v3
git-mirror · May 18, 2010 · 3daa121 · 3daa121
1 parent cad3c96
commit 3daa121
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35bc42c50432d3dde0119f7630f1e4574bd67519
+refs/heads/master: 279fcd48c4a426050422b2d196fd99c2b5ae7d71
diff --git a/trunk/drivers/video/omap2/dss/display.c b/trunk/drivers/video/omap2/dss/display.c
@@ -545,7 +545,10 @@ int dss_resume_all_devices(void)
 static int dss_disable_device(struct device *dev, void *data)
 {
 	struct omap_dss_device *dssdev = to_dss_device(dev);
-	dssdev->driver->disable(dssdev);
+
+	if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)
+		dssdev->driver->disable(dssdev);
+
 	return 0;
 }