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-27 16:27:28 +0800 |
| commit | 156f0b634839c33f1159db8f9268c6c25d531682 (patch) | |
| tree | 22286c05bb5f3270830a65f68175b7de9d2609ea | |
| parent | 06f35399ca60c22e23f82a35d6e93f380b90fcdd (diff) | |
omap dss hdmi allow enable while in suspended statetilt-android-tracking-156f0b634839c33f1159db8f9268c6c25d531682
Signed-off-by: Jaswinder Singh <jaswinder.singh@linaro.org>
| -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 8f3314f55d6..20e3d84076d 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; } |