evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i2c: rcar: check for no IRQ in rcar_i2c_irq()

Browse source 
Check if the ICMSR register (masked with the ICMIER register) evaluates to 0  in
the driver's interrupt handler and return IRQ_NONE in that case, like many other
drivers do.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Sergei Shtylyov 2014-09-15 00:20:19 +04:00 • committed by Wolfram Sang
parent 7c7117ffe0
commit aa5beaf625
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/i2c/busses/i2c-rcar.c
View file

@ -363,6 +363,7 @@ static int rcar_i2c_irq_recv(struct rcar_i2c_priv *priv, u32 msr)
static irqreturn_t rcar_i2c_irq(int irq, void *ptr) static irqreturn_t rcar_i2c_irq(int irq, void *ptr)
{ {
struct rcar_i2c_priv *priv = ptr; struct rcar_i2c_priv *priv = ptr;
irqreturn_t result = IRQ_HANDLED;
u32 msr; u32 msr;
/*-------------- spin lock -----------------*/ /*-------------- spin lock -----------------*/
@ -372,6 +373,10 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr)
/* Only handle interrupts that are currently enabled */ /* Only handle interrupts that are currently enabled */
msr &= rcar_i2c_read(priv, ICMIER); msr &= rcar_i2c_read(priv, ICMIER);
if (!msr) {
result = IRQ_NONE;
goto exit;
}
/* Arbitration lost */ /* Arbitration lost */
if (msr & MAL) { if (msr & MAL) {
@ -406,10 +411,11 @@ out:
wake_up(&priv->wait); wake_up(&priv->wait);
} }
exit:
spin_unlock(&priv->lock); spin_unlock(&priv->lock);
/*-------------- spin unlock -----------------*/ /*-------------- spin unlock -----------------*/
return IRQ_HANDLED; return result;
} }
static int rcar_i2c_master_xfer(struct i2c_adapter *adap, static int rcar_i2c_master_xfer(struct i2c_adapter *adap,