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

Commit 387fa6a5 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Russell King
Browse files

[ARM] 5203/1: i2c-pxa: fix scheduling while atomic in i2c_pxa_abort() 



i2c_pxa_abort can be called from the atomic context.
Change it to use mdelay and counted loop.

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9ba63c4f

drivers/i2c/busses/i2c-pxa.c

+4 −3
Original line number Diff line number Diff line
@@ -189,14 +189,14 @@ static inline int i2c_pxa_is_slavemode(struct pxa_i2c *i2c) 


static void i2c_pxa_abort(struct pxa_i2c *i2c)

{

	unsigned long timeout = jiffies + HZ/4;

	int i = 250;



	if (i2c_pxa_is_slavemode(i2c)) {

		dev_dbg(&i2c->adap.dev, "%s: called in slave mode\n", __func__);

		return;

	}



	while (time_before(jiffies, timeout) && (readl(_IBMR(i2c)) & 0x1) == 0) {

	while ((i > 0) && (readl(_IBMR(i2c)) & 0x1) == 0) {

		unsigned long icr = readl(_ICR(i2c));



		icr &= ~ICR_START;
@@ -206,7 +206,8 @@ static void i2c_pxa_abort(struct pxa_i2c *i2c) 


		show_state(i2c);



		msleep(1);

		mdelay(1);

		i --;

	}



	writel(readl(_ICR(i2c)) & ~(ICR_MA | ICR_START | ICR_STOP),