diff options
| author | Sanjay Singh Rawat <srawat@nvidia.com> | 2011-06-12 17:35:15 +0530 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2011-06-24 05:47:20 -0700 |
| commit | a1843ada65c4a2dc2fb5595f82d7f4a0fa01737a (patch) | |
| tree | 8b1afd0cc9ebc4ec9b4c01865e8134790354b582 | |
| parent | 76d918c240d4090a4e220dfb89ffc8e94c7c1997 (diff) | |
video: tegra: Do not set HDMI as a wakeup source
HDMI connect/disconnect will not affect the suspended device.
bug 835157
Change-Id: Ie094a2dcebdca2e405f3e02b4de3d12d0cb665f0
Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com>
Reviewed-on: http://git-master/r/37174
(cherry picked from commit 31f69bbe2e832a7dfa7678bb965b3461f421e0f5)
Reviewed-on: http://git-master/r/38089
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index 7c1d3482715f..f36dd8de9f0a 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -712,7 +712,6 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc) err = -EBUSY; goto err_put_clock; } - enable_irq_wake(gpio_to_irq(dc->out->hotplug_gpio)); hdmi->edid = tegra_edid_create(dc->out->dcc_bus); if (IS_ERR_OR_NULL(hdmi->edid)) { @@ -761,7 +760,6 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc) err_edid_destroy: tegra_edid_destroy(hdmi->edid); err_free_irq: - disable_irq_wake(gpio_to_irq(dc->out->hotplug_gpio)); free_irq(gpio_to_irq(dc->out->hotplug_gpio), dc); err_put_clock: if (!IS_ERR_OR_NULL(disp2_clk)) @@ -783,7 +781,6 @@ static void tegra_dc_hdmi_destroy(struct tegra_dc *dc) { struct tegra_dc_hdmi_data *hdmi = tegra_dc_get_outdata(dc); - disable_irq_wake(gpio_to_irq(dc->out->hotplug_gpio)); free_irq(gpio_to_irq(dc->out->hotplug_gpio), dc); cancel_delayed_work_sync(&hdmi->work); switch_dev_unregister(&hdmi->hpd_switch); |