tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: pxa2xx-ac97: fix error handling for reset GPIO descriptor

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.

Fixes: c76d50b71e89 ("ASoC: ac97: Convert to GPIO descriptors")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/r/202604041426.i2C1xqHk-lkp@intel.com/
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://patch.msgid.link/20260413-ac97-v1-1-b44b9e084307@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Peng Fan and committed by
Mark Brown 54a032d3 bc9b1eba

+9 -6
+9 -6
sound/arm/pxa2xx-ac97-lib.c
··· 331 331 if (dev->dev.of_node) { 332 332 /* Assert reset using GPIOD_OUT_HIGH, because reset is GPIO_ACTIVE_LOW */ 333 333 rst_gpio = devm_gpiod_get(&dev->dev, "reset", GPIOD_OUT_HIGH); 334 - ret = PTR_ERR(rst_gpio); 335 - if (ret == -ENOENT) 336 - reset_gpio = -1; 337 - else if (ret) 338 - return ret; 339 - reset_gpio = desc_to_gpio(rst_gpio); 334 + if (IS_ERR(rst_gpio)) { 335 + ret = PTR_ERR(rst_gpio); 336 + if (ret == -ENOENT) 337 + reset_gpio = -1; 338 + else if (ret) 339 + return ret; 340 + } else { 341 + reset_gpio = desc_to_gpio(rst_gpio); 342 + } 340 343 } else { 341 344 if (cpu_is_pxa27x()) 342 345 reset_gpio = 113;