summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-12-29 14:52:04 +0800
committerSebastien Jan <s-jan@ti.com>2012-01-06 16:41:27 +0100
commit0d16a1ae5ca2ce6d8d940724a4afabe41c57341f (patch)
tree150235576b419293d09c16e230636b66c515413a /drivers
parent296e4c2d59f82b408f1c76e1b4e26fb12169cc2c (diff)
omap dss hdmi detect use correct polarity
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/hdmi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 5be3bf488d1d..c471ea058c92 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -483,11 +483,12 @@ bool omapdss_hdmi_detect(struct omap_dss_device *dssdev)
mutex_lock(&hdmi.lock);
r = hdmi_runtime_get();
- if (r)
+ if (r) {
+ r = 0; /* ie, disconnected */
goto out;
+ }
- r = hdmi.ip_data.ops->detect(&hdmi.ip_data);
- r = !(r == 1);
+ r = hdmi.ip_data.ops->detect(&hdmi.ip_data) == 1;
hdmi_runtime_put();
out: