瀏覽代碼

OMAP: DSS2: Fix device disable when driver is not loaded

Only call driver disable when device isn't already disabled, which also
handles the driver not loaded case.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Jani Nikula 15 年之前
父節點
當前提交
279fcd48c4
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      drivers/video/omap2/dss/display.c

+ 4 - 1
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;
 }