]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR
authorJudy Hsiao <judyhsiao@chromium.org>
Fri, 1 Jul 2022 02:14:27 +0000 (02:14 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 5 Jul 2022 18:53:53 +0000 (19:53 +0100)
Add the error code '-EBUSY' when fail to read I2S_CLR
in rockchip_snd_rxctrl() and rockchip_snd_txctrl()

Fixes: c45e559c1fca ("ASoC: rockchip: i2s: switch BCLK to GPIO")
Signed-off-by: Judy Hsiao <judyhsiao@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Link: https://lore.kernel.org/r/20220701021427.3120549-1-judyhsiao@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/rockchip/rockchip_i2s.c

index 22ba1066c9336529dcf86aaa8aabfb44733cc5b8..ee33c5d2e948f0391a03de83e462ed9c345a97b6 100644 (file)
@@ -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;
                                }
                        }