summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/hdmi.c
diff options
context:
space:
mode:
authorSanjay Singh Rawat <srawat@nvidia.com>2011-12-01 19:10:08 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2011-12-08 17:06:15 +0530
commit94136f21090fe7f1887e0155ca61a1a973608213 (patch)
treee5def6233b8e06200628d0bbf4033287feece0c4 /drivers/video/tegra/dc/hdmi.c
parent13d38d2e94137f331606055f144d301d858cdd22 (diff)
video: tegra: hdmi: change the way hdmi bottom half is cancelled
Calling sychronous function cancel_delayed_work from interrupt context will put it on hold till work is cancelled, which is not recommended in ISR. Using similar function __cancel_delayed_work which works asynchronouly. Bug 885275 Change-Id: I356af7bf8a22f14aceda4b0171466884e0080da2 Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/67681 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/hdmi.c')
-rw-r--r--drivers/video/tegra/dc/hdmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index 7eedbacc90f5..c2584a143a30 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -869,7 +869,7 @@ static irqreturn_t tegra_dc_hdmi_irq(int irq, void *ptr)
spin_lock_irqsave(&hdmi->suspend_lock, flags);
if (!hdmi->suspended) {
- cancel_delayed_work(&hdmi->work);
+ __cancel_delayed_work(&hdmi->work);
if (tegra_dc_hdmi_hpd(dc))
queue_delayed_work(system_nrt_wq, &hdmi->work,
msecs_to_jiffies(100));