diff options
| author | Jani Nikula <[email protected]> | 2010-04-12 10:25:21 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <[email protected]> | 2010-08-03 15:18:48 +0300 |
| commit | fed44b7af8d9ce4c2c3d10a2e22e34ab596568a4 (patch) | |
| tree | 311b150237f4709d19fc3a8a2eddbb06bb05fec1 | |
| parent | 2c2fc151245df37dba17f4ae1760bfa97e4fd3c5 (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 <[email protected]>
Signed-off-by: Tomi Valkeinen <[email protected]>
| -rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 5 |
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 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); |