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

Commit a7f8289d authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-3.17-20140911' of git://gitorious.org/linux-can/linux-can 



Marc Kleine-Budde says:

====================
pull-request: can 2014-09-11

this is a pull request for the current release cycle of a single patch.

The patch by David Jander fixes a scheduling while atomic problem in the
flexcan driver, that was introduced by me in v3.14-rc6.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 381f4dca 8badd65e

drivers/net/can/flexcan.c

+5 −5
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int flexcan_chip_enable(struct flexcan_priv *priv) 
	flexcan_write(reg, &regs->mcr);



	while (timeout-- && (flexcan_read(&regs->mcr) & FLEXCAN_MCR_LPM_ACK))

		usleep_range(10, 20);

		udelay(10);



	if (flexcan_read(&regs->mcr) & FLEXCAN_MCR_LPM_ACK)

		return -ETIMEDOUT;
@@ -317,7 +317,7 @@ static int flexcan_chip_disable(struct flexcan_priv *priv) 
	flexcan_write(reg, &regs->mcr);



	while (timeout-- && !(flexcan_read(&regs->mcr) & FLEXCAN_MCR_LPM_ACK))

		usleep_range(10, 20);

		udelay(10);



	if (!(flexcan_read(&regs->mcr) & FLEXCAN_MCR_LPM_ACK))

		return -ETIMEDOUT;
@@ -336,7 +336,7 @@ static int flexcan_chip_freeze(struct flexcan_priv *priv) 
	flexcan_write(reg, &regs->mcr);



	while (timeout-- && !(flexcan_read(&regs->mcr) & FLEXCAN_MCR_FRZ_ACK))

		usleep_range(100, 200);

		udelay(100);



	if (!(flexcan_read(&regs->mcr) & FLEXCAN_MCR_FRZ_ACK))

		return -ETIMEDOUT;
@@ -355,7 +355,7 @@ static int flexcan_chip_unfreeze(struct flexcan_priv *priv) 
	flexcan_write(reg, &regs->mcr);



	while (timeout-- && (flexcan_read(&regs->mcr) & FLEXCAN_MCR_FRZ_ACK))

		usleep_range(10, 20);

		udelay(10);



	if (flexcan_read(&regs->mcr) & FLEXCAN_MCR_FRZ_ACK)

		return -ETIMEDOUT;
@@ -370,7 +370,7 @@ static int flexcan_chip_softreset(struct flexcan_priv *priv) 


	flexcan_write(FLEXCAN_MCR_SOFTRST, &regs->mcr);

	while (timeout-- && (flexcan_read(&regs->mcr) & FLEXCAN_MCR_SOFTRST))

		usleep_range(10, 20);

		udelay(10);



	if (flexcan_read(&regs->mcr) & FLEXCAN_MCR_SOFTRST)

		return -ETIMEDOUT;