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

Commit 2c2469bc authored by Boris Brezillon's avatar Boris Brezillon Committed by Lee Jones
Browse files

mfd: atmel-hlcdc: Do not sleep in atomic context 



readl_poll_timeout() calls usleep_range(), but
regmap_atmel_hlcdc_reg_write() is called in atomic context (regmap
spinlock held).

Replace the readl_poll_timeout() call by readl_poll_timeout_atomic().

Cc: <stable@vger.kernel.org>
Fixes: ea31c0cf ("mfd: atmel-hlcdc: Implement config synchronization")
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 22a96b85

drivers/mfd/atmel-hlcdc.c

+3 −2
Original line number Diff line number Diff line
@@ -50,8 +50,9 @@ static int regmap_atmel_hlcdc_reg_write(void *context, unsigned int reg, 
	if (reg <= ATMEL_HLCDC_DIS) {

		u32 status;



		readl_poll_timeout(hregmap->regs + ATMEL_HLCDC_SR, status,

				   !(status & ATMEL_HLCDC_SIP), 1, 100);

		readl_poll_timeout_atomic(hregmap->regs + ATMEL_HLCDC_SR,

					  status, !(status & ATMEL_HLCDC_SIP),

					  1, 100);

	}



	writel(val, hregmap->regs + reg);