From: Jani Nikula <ext-jani.1.nikula@nokia.com>
Date: Mon, 12 Apr 2010 07:25:21 +0000 (+0300)
Subject: OMAP: DSS2: Taal: Check taal_power_on() return value in taal_resume()
X-Git-Tag: v4.14-rc1~18319^2~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fed44b7af8d9ce4c2c3d10a2e22e34ab596568a4;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 137bad23a64e..19b5975a2312 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/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);