Skip to contentSkip to conversation

ALSA: atmel: ac97c: fix error return code in atmel_ac97c_probe()

PATCH Applied Gustavo A. R. Silva 2 participants 2 messages Jun 30, 2017 – Jul 1, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: atmel: ac97c: fix error return code in atmel_ac97c_probe()

platform_get_irq() returns an error code, but the ac97c driver ignores it and always returns -ENXIO. This is not correct, and prevents -EPROBE_DEFER from being propagated properly. Notice that platform_get_irq() no longer returns 0 on error.

Print and propagate the return value of platform_get_irq on failure.

---
 sound/atmel/ac97c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/atmel/ac97c.c +2 -2
index 65e6948..9d2c9d9 100644
@@ -774,8 +774,8 @@ static int atmel_ac97c_probe(struct platform_device *pdev)
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
-		dev_dbg(&pdev->dev, "could not get irq\n");
-		return -ENXIO;
+		dev_dbg(&pdev->dev, "could not get irq: %d\n", irq);
+		return irq;
 	}
 
 	pclk = clk_get(&pdev->dev, "ac97_clk");
Signature · 1 line
2.5.0
Applied
#1 lore raw
Quoted 9 lines · Gustavo A. R. Silva

platform_get_irq() returns an error code, but the ac97c driver ignores it and always returns -ENXIO. This is not correct, and prevents -EPROBE_DEFER from being propagated properly. Notice that platform_get_irq() no longer returns 0 on error.

Print and propagate the return value of platform_get_irq on failure.

Applied, thanks.

Takashi