summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-10-23 16:46:59 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-01 13:12:26 +0200
commit2cd232427c88a5ff0516988e1522ba77f0e91ddf (patch)
treee30e55944aef84c7068286faa7473e9f2009834d /sound/soc
parent6032b6e31b7e40820f11221166540d48f72e1324 (diff)
downloadlinux-stable-2cd232427c88a5ff0516988e1522ba77f0e91ddf.tar.gz
linux-stable-2cd232427c88a5ff0516988e1522ba77f0e91ddf.tar.bz2
linux-stable-2cd232427c88a5ff0516988e1522ba77f0e91ddf.zip
ASoC: kirkwood: fix IRQ error handling
[ Upstream commit 175fc928198236037174e5c5c066fe3c4691903e ] Propagate the error code from request_irq(), rather than returning -EBUSY. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Link: https://lore.kernel.org/r/E1iNIqh-0000tW-EZ@rmk-PC.armlinux.org.uk Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/kirkwood/kirkwood-dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
index cf23af159acf..35ca8e8bb5e5 100644
--- a/sound/soc/kirkwood/kirkwood-dma.c
+++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -136,7 +136,7 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
err = request_irq(priv->irq, kirkwood_dma_irq, IRQF_SHARED,
"kirkwood-i2s", priv);
if (err)
- return -EBUSY;
+ return err;
/*
* Enable Error interrupts. We're only ack'ing them but