diff options
| author | Gustavo A. R. Silva <garsilva@embeddedor.com> | 2017-07-01 00:46:33 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-17 14:05:42 +0300 |
| commit | e7b2e30a3f88b02b13a9bde05044142b38456004 (patch) | |
| tree | 4cd7016367897081d6d9e138c12f14b5ec85b55d | |
| parent | 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff) | |
| download | linux-e7b2e30a3f88b02b13a9bde05044142b38456004.tar.xz | |
ASoC: kirkwood-i2s: fix error return code in kirkwood_i2s_dev_probe()
platform_get_irq() returns an error code, but the kirkwood-i2s
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: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 3a36d60e1785..3b09f71b9535 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -550,9 +550,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) return PTR_ERR(priv->io); priv->irq = platform_get_irq(pdev, 0); - if (priv->irq <= 0) { - dev_err(&pdev->dev, "platform_get_irq failed\n"); - return -ENXIO; + if (priv->irq < 0) { + dev_err(&pdev->dev, "platform_get_irq failed: %d\n", priv->irq); + return priv->irq; } if (np) { |