summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-04 19:19:54 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-11 16:46:30 +0300
commitb9cb0984a6e6a09a4bcdc11ebc9f0eb71e5b6c85 (patch)
tree81a9a60b31abf4ac77720ba548eb9659a50a36c8
parent0cf35df353e8c36d4be0da2d7483896de599f397 (diff)
downloadlinux-b9cb0984a6e6a09a4bcdc11ebc9f0eb71e5b6c85.tar.xz
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)
break;
}
+ if (ret)
+ goto err;
+
_omap_dispc_set_irqs();
spin_unlock_irqrestore(&dispc.irq_lock, flags);