From fed44b7af8d9ce4c2c3d10a2e22e34ab596568a4 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 12 Apr 2010 10:25:21 +0300 Subject: [PATCH] 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 Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/displays/panel-taal.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); -- 2.39.5