summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
authorJani Nikula <ext-jani.1.nikula@nokia.com>2010-04-12 10:25:21 +0300
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-08-03 15:18:48 +0300
commitfed44b7af8d9ce4c2c3d10a2e22e34ab596568a4 (patch)
tree311b150237f4709d19fc3a8a2eddbb06bb05fec1 /drivers/video/omap2
parent2c2fc151245df37dba17f4ae1760bfa97e4fd3c5 (diff)
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>
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r--drivers/video/omap2/displays/panel-taal.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 137bad23a64..19b5975a231 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);