ASoC: pxa2xx-ac97: fix error handling for reset GPIO descriptor
Subsystems (2)
PATCH 1/1 ASoC: pxa2xx-ac97: fix error handling for reset GPIO descriptor
From: Peng Fan <[email protected]>
The reset GPIO obtained via devm_gpiod_get() may return an ERR_PTR() when the GPIO is missing or an error occurs. The current code unconditionally assigns PTR_ERR() to ret and later dereferences rst_gpio via desc_to_gpio(), which is incorrect when rst_gpio is an error pointer.
Rework the logic to first check IS_ERR(rst_gpio) before converting the descriptor. Handle -ENOENT by disabling reset GPIO support, and return other errors to the caller as expected.
--- sound/arm/pxa2xx-ac97-lib.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
sound/arm/pxa2xx-ac97-lib.c +9 -6
@@ -331,12 +331,15 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev)if (dev->dev.of_node) {/* Assert reset using GPIOD_OUT_HIGH, because reset is GPIO_ACTIVE_LOW */ rst_gpio =devm_gpiod_get (&dev->dev,"reset" ,GPIOD_OUT_HIGH ); - ret =PTR_ERR (rst_gpio); -if (ret == -ENOENT ) - reset_gpio =-1 ; -else if (ret) -return ret; - reset_gpio =desc_to_gpio (rst_gpio); +if (IS_ERR (rst_gpio)) { + ret =PTR_ERR (rst_gpio); +if (ret == -ENOENT ) + reset_gpio =-1 ; +else if (ret) +return ret; + }else { + reset_gpio =desc_to_gpio (rst_gpio); + } }else {if (cpu_is_pxa27x ()) reset_gpio =113 ;
---
base-commit: 66672af7a095d89f082c5327f3b15bc2f93d558e
change-id: 20260413-ac97-83224a44ed37
Best regards,
Signature · 1 line
Peng Fan <[email protected]>
Quoted 1 line · Peng Fan (OSS)
ASoC: pxa2xx-ac97: fix error handling for reset GPIO descriptor
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.1
Thanks!
[1/1] ASoC: pxa2xx-ac97: fix error handling for reset GPIO descriptor
https://git.kernel.org/broonie/sound/c/54a032d3e62f
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