From: Erik Gilling <konkers@android.com>
Date: Mon, 28 Feb 2011 23:28:49 +0000 (-0800)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~29
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=557c621d8a484da45f9167ae5922641a51afed95;p=firefly-linux-kernel-4.4.55.git

Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36

Change-Id: Ie01fff1ceddfbada480ef2928ac4791853787a49
---

557c621d8a484da45f9167ae5922641a51afed95
diff --cc drivers/video/tegra/dc/hdmi.c
index 92a12ee448c4,1c3f55449b42..46c599d14b75
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@@ -672,9 -666,9 +674,10 @@@ static void tegra_dc_hdmi_destroy(struc
  {
  	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);
  	iounmap(hdmi->base);
  	release_resource(hdmi->base_res);
  	clk_put(hdmi->clk);