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 <[email protected]>
---
 sound/soc/kirkwood/kirkwood-i2s.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/kirkwood/kirkwood-i2s.c 
b/sound/soc/kirkwood/kirkwood-i2s.c
index 3a36d60..3b09f71 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) {
-- 
2.5.0

Reply via email to