Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Mon, 28 Feb 2011 23:28:49 +0000 (15:28 -0800)
committerErik Gilling <konkers@android.com>
Mon, 28 Feb 2011 23:29:00 +0000 (15:29 -0800)
Change-Id: Ie01fff1ceddfbada480ef2928ac4791853787a49

1  2 
drivers/video/tegra/dc/hdmi.c

index 92a12ee448c4f195d030a92495d5f067618412a2,1c3f55449b421a29edc24ca53cf68205b828fa30..46c599d14b75c59a06dd3b7899d56dc414152e77
@@@ -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);