Commit dc695536 authored by Imre Deak's avatar Imre Deak Committed by Juha Yrjola

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: default avatarImre Deak <imre.deak@solidboot.com>
Signed-off-by: default avatarJuha Yrjola <juha.yrjola@solidboot.com>
parent ed4a95e8
...@@ -1139,7 +1139,7 @@ static void omap_dispc_cleanup(void) ...@@ -1139,7 +1139,7 @@ static void omap_dispc_cleanup(void)
{ {
cleanup_fbmem(); cleanup_fbmem();
free_palette_ram(); free_palette_ram();
free_irq(INT_24XX_DSS_IRQ, NULL); free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
enable_lcd_clocks(0); enable_lcd_clocks(0);
put_dss_clocks(); put_dss_clocks();
} }
......
...@@ -485,7 +485,8 @@ static void mipid_cleanup(struct lcd_panel *panel) ...@@ -485,7 +485,8 @@ static void mipid_cleanup(struct lcd_panel *panel)
{ {
struct mipid_device *md = to_mipid_device(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); destroy_workqueue(md->esd_wq);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment