mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
ASoC: rockchip: i2s: use regmap_read_poll_timeout_atomic to poll I2S_CLR
[ Upstream commitf0c8d7468a
] 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:fbb0ec656e
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
c218130c04
commit
bffdf4dad9
1 changed files with 12 additions and 12 deletions
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue