summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-12-13 12:50:45 +0800
committerSebastien Jan <s-jan@ti.com>2011-12-19 15:17:10 +0100
commit4c602ffaa67721479292de87f50a089cf3223e0a (patch)
treedb84916d000b3ca6bb587d49c2551fadf45c0b1d /drivers
parentf82e2b31e5694a237cd5a61a7299303cc64fcbed (diff)
dss protect hdmi panel enable path with dss rpm
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/hdmi_panel.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c
index 42e8b7c4465e..34477c70d9a5 100644
--- a/drivers/video/omap2/dss/hdmi_panel.c
+++ b/drivers/video/omap2/dss/hdmi_panel.c
@@ -59,8 +59,11 @@ static int hdmi_panel_enable(struct omap_dss_device *dssdev)
int r = 0;
DSSDBG("ENTER hdmi_panel_enable\n");
+ dss_runtime_get();
+
mutex_lock(&hdmi.hdmi_lock);
+
if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
r = -EINVAL;
goto err;
@@ -79,6 +82,8 @@ static int hdmi_panel_enable(struct omap_dss_device *dssdev)
err:
mutex_unlock(&hdmi.hdmi_lock);
+ dss_runtime_put();
+
return r;
}