diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-09-06 15:19:29 +0300 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-10-04 17:48:04 +0300 |
| commit | 2c2469bc03d569c49119db2cccb5cb3f0c6a5b33 (patch) | |
| tree | 420d4289e1777c496ca2c19699a0908bdba6918b /drivers/mfd | |
| parent | 22a96b85eabd05a77bd1388d041d96ccc8f86459 (diff) | |
| download | linux-2c2469bc03d569c49119db2cccb5cb3f0c6a5b33.tar.xz | |
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: ea31c0cf9b07 ("mfd: atmel-hlcdc: Implement config synchronization")
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/atmel-hlcdc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/atmel-hlcdc.c b/drivers/mfd/atmel-hlcdc.c index eca7ea69b81c..4b15b0840f16 100644 --- a/drivers/mfd/atmel-hlcdc.c +++ b/drivers/mfd/atmel-hlcdc.c @@ -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); |