summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/hdmi.c
diff options
context:
space:
mode:
authorJon Mayo <jmayo@nvidia.com>2013-05-07 18:10:11 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 13:13:14 -0700
commit05e0a5e03fe886d21f801329efeddcd2ab29ccae (patch)
tree21a8187f852d29f0c27ab26c7d3210b5cf8ca61e /drivers/video/tegra/dc/hdmi.c
parent7e52bcc6ca50f91bdcd8bc658a63a92eff7fe746 (diff)
tegra: dc: hdmi: don't call tegra_dc_hpd in spinlock
Avoid calling gpio_get_value_cansleep() inside a held spinlock. Change-Id: If0250a7a275cd8ad96de62432c83e0b948b359fd Signed-off-by: Jon Mayo <jmayo@nvidia.com> Reviewed-on: http://git-master/r/226458 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit (cherry picked from commit 946e53410468dafd92b6ccb313dba1bb1b72d04d) Reviewed-on: http://git-master/r/228058 Reviewed-by: Kevin Huang (Eng-SW) <kevinh@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/hdmi.c')
-rw-r--r--drivers/video/tegra/dc/hdmi.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index ce31ed030b17..2be1cd67a1e0 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -904,12 +904,8 @@ static irqreturn_t tegra_dc_hdmi_irq(int irq, void *ptr)
if (!hdmi->suspended) {
cancel_delayed_work(&hdmi->work);
- if (tegra_dc_hdmi_hpd(dc))
- queue_delayed_work(system_nrt_wq, &hdmi->work,
- msecs_to_jiffies(100));
- else
- queue_delayed_work(system_nrt_wq, &hdmi->work,
- msecs_to_jiffies(30));
+ queue_delayed_work(system_nrt_wq, &hdmi->work,
+ msecs_to_jiffies(100));
}
rt_mutex_unlock(&hdmi->suspend_lock);