ARM: OMAP: omapfb: fix error path

- pass dev_id to free_irq in dispc
- stop ESD poll only if it was started in lcd_mipid

Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>

diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index 4693bbf07a45135071948028c6aff3a85b6c6013..09e798807ec2c0e5f3414bb6fac001325a93ebc5 100644 (file)
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -1139,7 +1139,7 @@ static void omap_dispc_cleanup(void)
 {
        cleanup_fbmem();
        free_palette_ram();
-       free_irq(INT_24XX_DSS_IRQ, NULL);
+       free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
        enable_lcd_clocks(0);
        put_dss_clocks();
 }

diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index 5b73ff03e980ff0697b305e62c86939d51a5d6ef..e9623dc9ab6092d4ccca00c1a2b42f36aa4a1e68 100644 (file)
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -485,7 +485,8 @@ static void mipid_cleanup(struct lcd_panel *panel)
 {
        struct mipid_device *md = to_mipid_device(panel);
 
-       mipid_esd_stop_check(md);
+       if (md->enabled)
+               mipid_esd_stop_check(md);
        destroy_workqueue(md->esd_wq);
 }