diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-13 10:22:11 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-13 10:22:11 +0530 |
| commit | 9dbff3fcfe2e081db5eca9ba5fedfe83de1c5225 (patch) | |
| tree | 2f336c84c7cbc73feb47e7fa3605c86db0c98e20 | |
| parent | a52b6fbd3e06242edae1ea84368b4291407a91a1 (diff) | |
| parent | 0b8bff5ecc4b9077207db4f0adc4a3fdfb70fdb9 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
drivers/video/tegra/fb.c
Change-Id: Id2c7cf76925c140073baf04244b839c723515254
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index 5cf8041f3c46..476130f390dc 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -533,10 +533,13 @@ static irqreturn_t tegra_dc_hdmi_irq(int irq, void *ptr) if (hdmi->suspended) { hdmi->hpd_pending = true; } else { + cancel_delayed_work(&hdmi->work); if (tegra_dc_hdmi_hpd(dc)) - schedule_delayed_work(&hdmi->work, msecs_to_jiffies(100)); + queue_delayed_work(system_nrt_wq, &hdmi->work, + msecs_to_jiffies(100)); else - schedule_delayed_work(&hdmi->work, msecs_to_jiffies(0)); + queue_delayed_work(system_nrt_wq, &hdmi->work, + msecs_to_jiffies(30)); } spin_unlock_irqrestore(&hdmi->suspend_lock, flags); @@ -563,9 +566,11 @@ static void tegra_dc_hdmi_resume(struct tegra_dc *dc) hdmi->suspended = false; if (hdmi->hpd_pending) { if (tegra_dc_hdmi_hpd(dc)) - schedule_delayed_work(&hdmi->work, msecs_to_jiffies(100)); + queue_delayed_work(system_nrt_wq, &hdmi->work, + msecs_to_jiffies(100)); else - schedule_delayed_work(&hdmi->work, msecs_to_jiffies(0)); + queue_delayed_work(system_nrt_wq, &hdmi->work, + msecs_to_jiffies(30)); hdmi->hpd_pending = false; } spin_unlock_irqrestore(&hdmi->suspend_lock, flags); |