From: Jani Nikula <redacted>
Change state only if power on was succesful.
Signed-off-by: Jani Nikula <redacted>
---
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 af159c1..7b5f845 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);
--
1.6.5.2