aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-04 11:19:54 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-11 08:46:30 -0500
commitb9cb0984a6e6a09a4bcdc11ebc9f0eb71e5b6c85 (patch)
tree81a9a60b31abf4ac77720ba548eb9659a50a36c8
parent0cf35df353e8c36d4be0da2d7483896de599f397 (diff)
OMAP: DSS2: fix omap_dispc_register_isr() fail path
Fix handling of error in omap_dispc_register_isr() in case there are no free isr slots available. Reported-by: Ben Tucker <btucker@mpcdata.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/omap2/dss/dispc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index dae9686fb437..4a368c47700e 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2831,6 +2831,9 @@ int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask)
2831 break; 2831 break;
2832 } 2832 }
2833 2833
2834 if (ret)
2835 goto err;
2836
2834 _omap_dispc_set_irqs(); 2837 _omap_dispc_set_irqs();
2835 2838
2836 spin_unlock_irqrestore(&dispc.irq_lock, flags); 2839 spin_unlock_irqrestore(&dispc.irq_lock, flags);