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 137bad23a64e96efbb75813db85735dcb89d26b8..19b5975a2312d8e7e32345b702a2f6f23343eabb 100644 (file)
--- 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);