| Message ID | 1412755131-27542-1-git-send-email-sonnyrao@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 29f95bd76f6ec1eff88eec6a04191104a11a7f97 |
| Headers | show |
On Wed, Oct 08, 2014 at 12:58:51AM -0700, Sonny Rao wrote: > We can get into an infinite loop if the I2S_CLR register fails to > clear due to a missing break statement, so add that. Applied, thanks.
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 033487c..f373e37 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -108,8 +108,10 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) while (val) { regmap_read(i2s->regmap, I2S_CLR, &val); retry--; - if (!retry) + if (!retry) { dev_warn(i2s->dev, "fail to clear\n"); + break; + } } } }
We can get into an infinite loop if the I2S_CLR register fails to clear due to a missing break statement, so add that. Signed-off-by: Sonny Rao <sonnyrao@chromium.org> --- sound/soc/rockchip/rockchip_i2s.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)