aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorMike J. Chen <mjchen@google.com>2011-06-10 12:22:49 -0700
committerZiyann <jaraidaniel@gmail.com>2014-10-01 12:59:12 +0200
commit082e24d702a87372e43fac4da1da104a7326ebb0 (patch)
tree2ac070a151a7b0c08f92298f4d2a629e5c1dc916 /arch/arm/plat-omap
parent382ca415c67dbfa26913b9ffbaafdc99ed7d8bbb (diff)
downloadkernel_samsung_tuna-082e24d702a87372e43fac4da1da104a7326ebb0.zip
kernel_samsung_tuna-082e24d702a87372e43fac4da1da104a7326ebb0.tar.gz
kernel_samsung_tuna-082e24d702a87372e43fac4da1da104a7326ebb0.tar.bz2
OMAP: mcbsp: Fix error checks of rx_irq.
rx_irq is intialized via a call to platform_get_irq_byname(), which can return a negative error value. Also, zero is a valid irq. Fix checks that assumed non-zero values were the only valid rx_irq values. Change-Id: I6be171eefa5923021e4adccf71f21baad3383554 Signed-off-by: Mike J. Chen <mjchen@google.com> Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/mcbsp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index eb1ae5b..7b0d9b7 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -833,7 +833,7 @@ int omap_mcbsp_request(unsigned int id)
goto err_clk_disable;
}
- if (mcbsp->rx_irq) {
+ if (mcbsp->rx_irq >= 0) {
init_completion(&mcbsp->rx_irq_completion);
err = request_irq(mcbsp->rx_irq,
omap_mcbsp_rx_irq_handler,
@@ -891,7 +891,7 @@ void omap_mcbsp_free(unsigned int id)
if (mcbsp->io_type == OMAP_MCBSP_IRQ_IO) {
/* Free IRQs */
- if (mcbsp->rx_irq)
+ if (mcbsp->rx_irq >= 0)
free_irq(mcbsp->rx_irq, (void *)mcbsp);
free_irq(mcbsp->tx_irq, (void *)mcbsp);
}