asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i2c: omap: sanitize exit path

Browse source 
move the goto out label one line down, so that
it can be used when stat is read as zero. All
other exits, can be done with a break statement.

While at that, also break out as soon as we
complete draining IRQ, since at that time
we know we transferred everything there was
to be transferred.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
Felipe Balbi 2012-09-12 16:28:16 +05:30 committed by Wolfram Sang
parent 6d8451d55a
commit 0bdfe0cb80
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/i2c/busses/i2c-omap.c
View file

@ -901,27 +901,26 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
if (!stat) { if (!stat) {
/* my work here is done */ /* my work here is done */
spin_unlock_irqrestore(&dev->lock, flags); goto out;
return IRQ_HANDLED;
} }
dev_dbg(dev->dev, "IRQ (ISR = 0x%04x)\n", stat); dev_dbg(dev->dev, "IRQ (ISR = 0x%04x)\n", stat);
if (count++ == 100) { if (count++ == 100) {
dev_warn(dev->dev, "Too much work in one IRQ\n"); dev_warn(dev->dev, "Too much work in one IRQ\n");
goto out; break;
} }
if (stat & OMAP_I2C_STAT_NACK) { if (stat & OMAP_I2C_STAT_NACK) {
err |= OMAP_I2C_STAT_NACK; err |= OMAP_I2C_STAT_NACK;
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
goto out; break;
} }
if (stat & OMAP_I2C_STAT_AL) { if (stat & OMAP_I2C_STAT_AL) {
dev_err(dev->dev, "Arbitration lost\n"); dev_err(dev->dev, "Arbitration lost\n");
err |= OMAP_I2C_STAT_AL; err |= OMAP_I2C_STAT_AL;
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL); omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);
goto out; break;
} }
/* /*
@ -934,7 +933,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XRDY |
OMAP_I2C_STAT_XDR | OMAP_I2C_STAT_XDR |
OMAP_I2C_STAT_ARDY)); OMAP_I2C_STAT_ARDY));
goto out; break;
} }
if (stat & OMAP_I2C_STAT_RDR) { if (stat & OMAP_I2C_STAT_RDR) {
@ -949,7 +948,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
i2c_omap_errata_i207(dev, stat); i2c_omap_errata_i207(dev, stat);
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RDR); omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RDR);
continue; break;
} }
if (stat & OMAP_I2C_STAT_RRDY) { if (stat & OMAP_I2C_STAT_RRDY) {
@ -972,10 +971,10 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
ret = omap_i2c_transmit_data(dev, num_bytes, true); ret = omap_i2c_transmit_data(dev, num_bytes, true);
if (ret < 0) if (ret < 0)
goto out; break;
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR); omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR);
continue; break;
} }
if (stat & OMAP_I2C_STAT_XRDY) { if (stat & OMAP_I2C_STAT_XRDY) {
@ -987,7 +986,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
ret = omap_i2c_transmit_data(dev, num_bytes, false); ret = omap_i2c_transmit_data(dev, num_bytes, false);
if (ret < 0) if (ret < 0)
goto out; break;
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY); omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY);
continue; continue;
@ -997,19 +996,20 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
dev_err(dev->dev, "Receive overrun\n"); dev_err(dev->dev, "Receive overrun\n");
err |= OMAP_I2C_STAT_ROVR; err |= OMAP_I2C_STAT_ROVR;
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ROVR); omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ROVR);
goto out; break;
} }
if (stat & OMAP_I2C_STAT_XUDF) { if (stat & OMAP_I2C_STAT_XUDF) {
dev_err(dev->dev, "Transmit underflow\n"); dev_err(dev->dev, "Transmit underflow\n");
err |= OMAP_I2C_STAT_XUDF; err |= OMAP_I2C_STAT_XUDF;
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF); omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF);
goto out; break;
} }
} while (stat); } while (stat);
out:
omap_i2c_complete_cmd(dev, err); omap_i2c_complete_cmd(dev, err);
out:
spin_unlock_irqrestore(&dev->lock, flags); spin_unlock_irqrestore(&dev->lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;