diff options
| author | Jaswinder Singh <jaswinder.singh@linaro.org> | 2012-06-22 11:26:22 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-06-22 11:26:22 +0800 |
| commit | 61abde21bf6272908466e2d13acd479743b4f0b3 (patch) | |
| tree | 1843857d6cc29a69b2ef71faf779f3636b06ede7 | |
| parent | d75072c05c93da329675f330a26efe523b88f68d (diff) | |
omapdss temp hack ignore resume runtime_pm faillinux-release-2012-06android-release-2012-06
Signed-off-by: Jaswinder Singh <jaswinder.singh@linaro.org>
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 2 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 36eae36f5abd..4b1cc32d352c 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -374,7 +374,7 @@ int dispc_runtime_get(void) r = pm_runtime_get_sync(&dispc.pdev->dev); WARN_ON(r < 0); - return r < 0 ? r : 0; + return 0;//r < 0 ? r : 0; } void dispc_runtime_put(void) diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index fe0719f7772c..776f68803f41 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -140,7 +140,7 @@ static int hdmi_runtime_get(void) r = pm_runtime_get_sync(&hdmi.pdev->dev); WARN_ON(r < 0); if (r < 0) - return r; + return 0; return 0; } |