| From 2667bfefdecce073e2d0b594cf15f9f8072066d4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 23 Oct 2019 16:46:59 +0100 |
| Subject: ASoC: kirkwood: fix IRQ error handling |
| |
| From: Russell King <rmk+kernel@armlinux.org.uk> |
| |
| [ 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> |
| --- |
| sound/soc/kirkwood/kirkwood-dma.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c |
| index dbfdfe99c69df..231c7d97333c7 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 |
| -- |
| 2.25.1 |
| |
