summaryrefslogtreecommitdiffstats
path: root/sound/atmel
diff options
context:
space:
mode:
authorGustavo A. R. Silva <garsilva@embeddedor.com>2017-06-30 17:34:23 -0500
committerTakashi Iwai <tiwai@suse.de>2017-07-01 08:03:34 +0200
commit7720113516eacd7b91272c2298b1b392ae1ae436 (patch)
treee4b2c2e3e10374c7b508c8b750000aa9f89fa4f8 /sound/atmel
parent1967158fff819b38f4e46763ca8df067b4b69f59 (diff)
downloadlinux-stable-7720113516eacd7b91272c2298b1b392ae1ae436.tar.gz
linux-stable-7720113516eacd7b91272c2298b1b392ae1ae436.tar.bz2
linux-stable-7720113516eacd7b91272c2298b1b392ae1ae436.zip
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. Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/atmel')
-rw-r--r--sound/atmel/ac97c.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 65e6948e3995..9d2c9d9af688 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -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");