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

Commit 8badd65e authored by David Jander's avatar David Jander Committed by Marc Kleine-Budde
Browse files

can: flexcan: avoid calling usleep_range from interrupt context 



Apparently can_restart() runs from a (timer-) interrupt and can call
flexcan_chip_[en|dis]able(), so avoid using usleep_range()

Signed-off-by: default avatarDavid Jander <david@protonic.nl>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 1d7efe9d

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;