浏览代码

OMAP: DSS2: Taal: Check taal_power_on() return value in taal_resume()

Change state only if power on was succesful.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Jani Nikula 15 年之前
父节点
当前提交
fed44b7af8
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      drivers/video/omap2/displays/panel-taal.c

+ 4 - 1
drivers/video/omap2/displays/panel-taal.c

@@ -882,7 +882,10 @@ static int taal_resume(struct omap_dss_device *dssdev)
 
 	dsi_bus_unlock();
 
-	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+	if (r)
+		dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+	else
+		dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
 
 	mutex_unlock(&td->lock);