]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
tegra: dc: hdmi: don't call tegra_dc_hpd in spinlock
authorJon Mayo <jmayo@nvidia.com>
Wed, 8 May 2013 01:10:11 +0000 (18:10 -0700)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 20:13:14 +0000 (13:13 -0700)
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>
drivers/video/tegra/dc/hdmi.c

index ce31ed030b17eae3a9bba52805b15e7c5153d050..2be1cd67a1e09c4c72928b7f4874a94dd2477296 100644 (file)
@@ -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);