This is a note to let you know that I've just added the patch titled
ASoC: rockchip-i2s: fix infinite loop in rockchip_snd_rxctrl
to the 3.17-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-rockchip-i2s-fix-infinite-loop-in-rockchip_snd_rxctrl.patch
and it can be found in the queue-3.17 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 29f95bd76f6ec1eff88eec6a04191104a11a7f97 Mon Sep 17 00:00:00 2001
From: Jianqun <jay.xu@xxxxxxxxxxxxxx>
Date: Wed, 29 Oct 2014 17:45:51 +0800
Subject: ASoC: rockchip-i2s: fix infinite loop in rockchip_snd_rxctrl
From: Jianqun <jay.xu@xxxxxxxxxxxxxx>
commit 29f95bd76f6ec1eff88eec6a04191104a11a7f97 upstream.
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: Jianqun <jay.xu@xxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/rockchip/rockchip_i2s.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -152,8 +152,10 @@ static void rockchip_snd_rxctrl(struct r
while (val) {
regmap_read(i2s->regmap, I2S_CLR, &val);
retry--;
- if (!retry)
+ if (!retry) {
dev_warn(i2s->dev, "fail to clear\n");
+ break;
+ }
}
}
}
Patches currently in stable-queue which might be from jay.xu@xxxxxxxxxxxxxx are
queue-3.17/asoc-rockchip-i2s-fix-infinite-loop-in-rockchip_snd_rxctrl.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html