[PATCH 4/6] [media] st-rc: prevent a endless loop
Mauro Carvalho Chehab
mchehab at osg.samsung.com
Sun Mar 6 05:39:20 PST 2016
As warned by smatch:
drivers/media/rc/st_rc.c:110 st_rc_rx_interrupt() warn: this loop depends on readl() succeeding
as readl() might fail, with likely means some unrecovered error,
let's loop only if it succeeds.
Signed-off-by: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
---
drivers/media/rc/st_rc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/rc/st_rc.c b/drivers/media/rc/st_rc.c
index 1fa0c9d1c508..151bfe2aea55 100644
--- a/drivers/media/rc/st_rc.c
+++ b/drivers/media/rc/st_rc.c
@@ -99,7 +99,7 @@ static irqreturn_t st_rc_rx_interrupt(int irq, void *data)
unsigned int symbol, mark = 0;
struct st_rc_device *dev = data;
int last_symbol = 0;
- u32 status;
+ int status;
DEFINE_IR_RAW_EVENT(ev);
if (dev->irq_wake)
@@ -107,7 +107,7 @@ static irqreturn_t st_rc_rx_interrupt(int irq, void *data)
status = readl(dev->rx_base + IRB_RX_STATUS);
- while (status & (IRB_FIFO_NOT_EMPTY | IRB_OVERFLOW)) {
+ while (status > 0 && (status & (IRB_FIFO_NOT_EMPTY | IRB_OVERFLOW))) {
u32 int_status = readl(dev->rx_base + IRB_RX_INT_STATUS);
if (unlikely(int_status & IRB_RX_OVERRUN_INT)) {
/* discard the entire collection in case of errors! */
--
2.5.0
More information about the linux-arm-kernel
mailing list