From dc6955364577ce8f72be42f0e0b8ce0417bcd8d0 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Wed, 2 Aug 2006 23:51:13 +0300 Subject: [PATCH] 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 Signed-off-by: Juha Yrjola --- drivers/video/omap/dispc.c | 2 +- drivers/video/omap/lcd_mipid.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index 4693bbf07a4..09e798807ec 100644 --- 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 5b73ff03e98..e9623dc9ab6 100644 --- 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); } -- 2.41.1