Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa5beaf6 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Wolfram Sang
Browse files

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



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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 7c7117ff

drivers/i2c/busses/i2c-rcar.c

+7 −1
Original line number Diff line number Diff line
@@ -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)

{

	struct rcar_i2c_priv *priv = ptr;

	irqreturn_t result = IRQ_HANDLED;

	u32 msr;



	/*-------------- spin lock -----------------*/
@@ -372,6 +373,10 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr) 


	/* Only handle interrupts that are currently enabled */

	msr &= rcar_i2c_read(priv, ICMIER);

	if (!msr) {

		result = IRQ_NONE;

		goto exit;

	}



	/* Arbitration lost */

	if (msr & MAL) {
@@ -406,10 +411,11 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr) 
		wake_up(&priv->wait);

	}



exit:

	spin_unlock(&priv->lock);

	/*-------------- spin unlock -----------------*/



	return IRQ_HANDLED;

	return result;

}



static int rcar_i2c_master_xfer(struct i2c_adapter *adap,