From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Fri, 4 Mar 2011 16:19:54 +0000 (+0200)
Subject: OMAP: DSS2: fix omap_dispc_register_isr() fail path
X-Git-Tag: v2.6.39-rc1~98^2~58^2~30
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b9cb0984a6e6a09a4bcdc11ebc9f0eb71e5b6c85;p=karo-tx-linux.git

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>
---

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);