| Message ID | 20220701021427.3120549-1-judyhsiao@chromium.org |
|---|---|
| State | Accepted |
| Commit | 0ff9f8b9f59208332c6707e37d5739c57c7f7bce |
| Headers | show |
| Series | [v1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR | expand |
Hi Judy, Am Freitag, 1. Juli 2022, 04:14:27 CEST schrieb Judy Hsiao: > Add the error code '-EBUSY' when fail to read I2S_CLR > in rockchip_snd_rxctrl() and rockchip_snd_txctrl() > > Fixes: 44f362c2cc6d ("ASoC: rockchip: i2s: switch BCLK to GPIO") > Signed-off-by: Judy Hsiao <judyhsiao@chromium.org> those chromium-tags in patch subjects are not meant to go into upstream submissions, so please drop the FROMGIT. > --- > sound/soc/rockchip/rockchip_i2s.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c > index f783994cc16a..fd36c0bacc43 100644 > --- a/sound/soc/rockchip/rockchip_i2s.c > +++ b/sound/soc/rockchip/rockchip_i2s.c > @@ -171,6 +171,7 @@ static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) > retry--; > if (!retry) { > dev_warn(i2s->dev, "fail to clear\n"); > + ret = -EBUSY; > break; > } > } > @@ -232,6 +233,7 @@ static int rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) > retry--; > if (!retry) { > dev_warn(i2s->dev, "fail to clear\n"); > + ret = -EBUSY; > break; > } > } >
On Thu, Jun 30, 2022 at 7:14 PM Judy Hsiao <judyhsiao@chromium.org> wrote: > > Add the error code '-EBUSY' when fail to read I2S_CLR > in rockchip_snd_rxctrl() and rockchip_snd_txctrl() > > Fixes: 44f362c2cc6d ("ASoC: rockchip: i2s: switch BCLK to GPIO") > Signed-off-by: Judy Hsiao <judyhsiao@chromium.org> Apart from the FROMGIT subject: Reviewed-by: Brian Norris <briannorris@chromium.org>
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index f783994cc16a..fd36c0bacc43 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -171,6 +171,7 @@ static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) retry--; if (!retry) { dev_warn(i2s->dev, "fail to clear\n"); + ret = -EBUSY; break; } } @@ -232,6 +233,7 @@ static int rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) retry--; if (!retry) { dev_warn(i2s->dev, "fail to clear\n"); + ret = -EBUSY; break; } }
Add the error code '-EBUSY' when fail to read I2S_CLR in rockchip_snd_rxctrl() and rockchip_snd_txctrl() Fixes: 44f362c2cc6d ("ASoC: rockchip: i2s: switch BCLK to GPIO") Signed-off-by: Judy Hsiao <judyhsiao@chromium.org> --- sound/soc/rockchip/rockchip_i2s.c | 2 ++ 1 file changed, 2 insertions(+)