diff options
author | Jaswider Singh <jaswinder.singh@linaro.org> | 2011-12-26 20:20:32 +0800 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2011-12-26 20:20:32 +0800 |
commit | f249fc56ec497c9261d9a83ed84d2f6e4e19e0e1 (patch) | |
tree | d335e7475b322c5f92c85d8e3d9de22aa07eab96 /drivers/video | |
parent | 0d7895bb78fedc7cf98183cf48abc28ada1d8840 (diff) |
omap dss hdmi allow enable while in suspended statetilt-android-tracking-f249fc56ec497c9261d9a83ed84d2f6e4e19e0e1
Signed-off-by: Jaswinder Singh <jaswinder.singh@linaro.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/omap2/dss/dss.h | 2 | ||||
-rw-r--r-- | drivers/video/omap2/dss/hdmi_panel.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h index 28c5559a804..57c0651fa53 100644 --- a/drivers/video/omap2/dss/dss.h +++ b/drivers/video/omap2/dss/dss.h @@ -23,9 +23,7 @@ #ifndef __OMAP2_DSS_H #define __OMAP2_DSS_H -#ifdef CONFIG_OMAP2_DSS_DEBUG_SUPPORT #define DEBUG -#endif #ifdef DEBUG extern unsigned int dss_debug; diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c index ef37bd5b03d..a93412005fc 100644 --- a/drivers/video/omap2/dss/hdmi_panel.c +++ b/drivers/video/omap2/dss/hdmi_panel.c @@ -90,9 +90,8 @@ static int hdmi_panel_enable(struct omap_dss_device *dssdev) mutex_lock(&hdmi.hdmi_lock); - if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) { - r = -EINVAL; +// r = -EINVAL; goto err; } |