summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJudy Hsiao <judyhsiao@chromium.org>2022-09-30 18:15:46 +0300
committerMark Brown <broonie@kernel.org>2022-09-30 19:12:27 +0300
commitf0c8d7468af0001b80b0c86802ee28063f800987 (patch)
tree288748c3ec540feb0532f413ce2db05e79ecda45 /sound
parent853110992cfefec433ca58cf7d69df4f639abe18 (diff)
downloadlinux-f0c8d7468af0001b80b0c86802ee28063f800987.tar.xz
ASoC: rockchip: i2s: use regmap_read_poll_timeout_atomic to poll I2S_CLR
1. Uses regmap_read_poll_timeout_atomic to poll I2S_CLR as it is called within a spin lock. 2. Fixes the typo of break condition in regmap_read_poll_timeout_atomic. Fixes: fbb0ec656ee5 ("ASoC: rockchip: i2s: use regmap_read_poll_timeout to poll I2S_CLR") Signed-off-by: Judy Hsiao <judyhsiao@chromium.org> Link: https://lore.kernel.org/r/20220930151546.2017667-1-judyhsiao@chromium.org Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/rockchip/rockchip_i2s.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 28c86f5e435e..a8758ad68442 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -162,12 +162,12 @@ static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
I2S_CLR_TXC | I2S_CLR_RXC);
if (ret < 0)
goto end;
- ret = regmap_read_poll_timeout(i2s->regmap,
- I2S_CLR,
- val,
- val != 0,
- 20,
- 200);
+ ret = regmap_read_poll_timeout_atomic(i2s->regmap,
+ I2S_CLR,
+ val,
+ val == 0,
+ 20,
+ 200);
if (ret < 0)
dev_warn(i2s->dev, "fail to clear: %d\n", ret);
}
@@ -220,12 +220,12 @@ static int rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on)
I2S_CLR_TXC | I2S_CLR_RXC);
if (ret < 0)
goto end;
- ret = regmap_read_poll_timeout(i2s->regmap,
- I2S_CLR,
- val,
- val != 0,
- 20,
- 200);
+ ret = regmap_read_poll_timeout_atomic(i2s->regmap,
+ I2S_CLR,
+ val,
+ val == 0,
+ 20,
+ 200);
if (ret < 0)
dev_warn(i2s->dev, "fail to clear: %d\n", ret);
}