* [PATCH v1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR
@ 2022-07-01 2:14 Judy Hsiao
2022-07-01 7:26 ` Heiko Stuebner
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Judy Hsiao @ 2022-07-01 2:14 UTC (permalink / raw)
To: Heiko Stuebner
Cc: Liam Girdwood, Rob Herring, Brian Norris, Mark Brown,
Jaroslav Kysela, Chen-Yu Tsai, alsa-devel, linux-arm-kernel,
linux-rockchip, linux-kernel, 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>
---
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;
}
}
--
2.37.0.rc0.161.g10f37bed90-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR
2022-07-01 2:14 [PATCH v1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR Judy Hsiao
@ 2022-07-01 7:26 ` Heiko Stuebner
2022-07-01 16:47 ` Brian Norris
2022-07-06 11:07 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Heiko Stuebner @ 2022-07-01 7:26 UTC (permalink / raw)
To: Judy Hsiao
Cc: Liam Girdwood, Rob Herring, Brian Norris, Mark Brown,
Jaroslav Kysela, Chen-Yu Tsai, alsa-devel, linux-arm-kernel,
linux-rockchip, linux-kernel, Judy Hsiao
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;
> }
> }
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR
2022-07-01 2:14 [PATCH v1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR Judy Hsiao
2022-07-01 7:26 ` Heiko Stuebner
@ 2022-07-01 16:47 ` Brian Norris
2022-07-06 11:07 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Brian Norris @ 2022-07-01 16:47 UTC (permalink / raw)
To: Judy Hsiao
Cc: Heiko Stuebner, Liam Girdwood, Rob Herring, Mark Brown,
Jaroslav Kysela, Chen-Yu Tsai, alsa-devel, linux-arm-kernel,
open list:ARM/Rockchip SoC...,
Linux Kernel
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>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR
2022-07-01 2:14 [PATCH v1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR Judy Hsiao
2022-07-01 7:26 ` Heiko Stuebner
2022-07-01 16:47 ` Brian Norris
@ 2022-07-06 11:07 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2022-07-06 11:07 UTC (permalink / raw)
To: heiko, judyhsiao
Cc: linux-kernel, alsa-devel, linux-rockchip, Rob Herring, wenst,
Jaroslav Kysela, linux-arm-kernel, Liam Girdwood, briannorris
On Fri, 1 Jul 2022 02:14:27 +0000, Judy Hsiao wrote:
> Add the error code '-EBUSY' when fail to read I2S_CLR
> in rockchip_snd_rxctrl() and rockchip_snd_txctrl()
>
>
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR
commit: 0ff9f8b9f59208332c6707e37d5739c57c7f7bce
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-06 11:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-01 2:14 [PATCH v1] FROMGIT: ASoC: rockchip: i2s: Fix error code when fail to read I2S_CLR Judy Hsiao
2022-07-01 7:26 ` Heiko Stuebner
2022-07-01 16:47 ` Brian Norris
2022-07-06 11:07 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).