diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 71389630b108ec4613080422ab6fb9ecc5121dc1..ef8c8529dda23fba9a97fc5c81970a3d8fe5ca06 100644
--- a/drivers/video/omap2/dss/display.c
+++ b/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;
 }