aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/displays/panel-acx565akm.c
diff options
context:
space:
mode:
authorStanley.Miao <stanley.miao@windriver.com>2010-09-02 23:03:48 -0400
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-10-22 16:21:14 -0400
commit18016e35d448d35739f8640b51476709c07e95db (patch)
treef01f76bd471332308d6e7c22af6310386437d121 /drivers/video/omap2/displays/panel-acx565akm.c
parent41814cfc01b059df33011d929837558c22f3c0e0 (diff)
OMAP: DSS2: don't power off a panel twice
If we blank the panel by echo 1 > /sys/devices/platform/omapfb/graphics/fb0/blank Then, we reboot the sytem, the kernel will crash at drivers/video/omap2/dss/core.c:323 This is because the panel is closed twice. Now check the state of a dssdev to forbid a panel is power on or power off twice. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/displays/panel-acx565akm.c')
-rw-r--r--drivers/video/omap2/displays/panel-acx565akm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
index 07fbb8a733b..e7731065320 100644
--- a/drivers/video/omap2/displays/panel-acx565akm.c
+++ b/drivers/video/omap2/displays/panel-acx565akm.c
@@ -587,6 +587,9 @@ static int acx_panel_power_on(struct omap_dss_device *dssdev)
587 587
588 dev_dbg(&dssdev->dev, "%s\n", __func__); 588 dev_dbg(&dssdev->dev, "%s\n", __func__);
589 589
590 if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
591 return 0;
592
590 mutex_lock(&md->mutex); 593 mutex_lock(&md->mutex);
591 594
592 r = omapdss_sdi_display_enable(dssdev); 595 r = omapdss_sdi_display_enable(dssdev);
@@ -644,6 +647,9 @@ static void acx_panel_power_off(struct omap_dss_device *dssdev)
644 647
645 dev_dbg(&dssdev->dev, "%s\n", __func__); 648 dev_dbg(&dssdev->dev, "%s\n", __func__);
646 649
650 if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
651 return;
652
647 mutex_lock(&md->mutex); 653 mutex_lock(&md->mutex);
648 654
649 if (!md->enabled) { 655 if (!md->enabled) {