2024-06-08 14:24:49

by Dan Carpenter

[permalink] [raw]
Subject: [PATCH] ASoC: samsung: midas_wm1811: Fix error code in probe()

This accidentally returns success instead of -EINVAL.

Fixes: c91d0c2e198d ("ASoC: samsung: midas_wm1811: Add GPIO-based headset jack detection")
Signed-off-by: Dan Carpenter <[email protected]>
---
sound/soc/samsung/midas_wm1811.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/samsung/midas_wm1811.c b/sound/soc/samsung/midas_wm1811.c
index 3a269c7de169..bbfe5fef59af 100644
--- a/sound/soc/samsung/midas_wm1811.c
+++ b/sound/soc/samsung/midas_wm1811.c
@@ -623,7 +623,7 @@ static int midas_probe(struct platform_device *pdev)

if (channel_type != IIO_VOLTAGE) {
dev_err(dev, "ADC channel is not voltage\n");
- return ret;
+ return -EINVAL;
}

priv->gpio_headset_key = devm_gpiod_get(dev, "headset-key",
--
2.43.0



2024-06-11 12:48:59

by Artur Weber

[permalink] [raw]
Subject: Re: [PATCH] ASoC: samsung: midas_wm1811: Fix error code in probe()

On 8.06.2024 16:24, Dan Carpenter wrote:
> This accidentally returns success instead of -EINVAL.
>
> Fixes: c91d0c2e198d ("ASoC: samsung: midas_wm1811: Add GPIO-based headset jack detection")
> Signed-off-by: Dan Carpenter <[email protected]>

Good catch, thanks!

Acked-by: Artur Weber <[email protected]>

2024-06-12 17:10:33

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] ASoC: samsung: midas_wm1811: Fix error code in probe()

On Sat, 08 Jun 2024 17:24:31 +0300, Dan Carpenter wrote:
> This accidentally returns success instead of -EINVAL.
>
>

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: samsung: midas_wm1811: Fix error code in probe()
commit: 5c33876a20e1f42471c2b6fd1804428311d35f1f

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