ASoC: twl6040: fix error return code in twl6040_probe()
authorGustavo A. R. Silva <garsilva@embeddedor.com>
Fri, 30 Jun 2017 22:26:48 +0000 (17:26 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 17 Jul 2017 11:06:09 +0000 (12:06 +0100)
platform_get_irq() returns an error code, but the twl6040
driver ignores it and always returns -EINVAL. 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>
sound/soc/codecs/twl6040.c

index 2b6ad09..96cf94a 100644 (file)
@@ -1123,8 +1123,8 @@ static int twl6040_probe(struct snd_soc_codec *codec)
 
        priv->plug_irq = platform_get_irq(pdev, 0);
        if (priv->plug_irq < 0) {
-               dev_err(codec->dev, "invalid irq\n");
-               return -EINVAL;
+               dev_err(codec->dev, "invalid irq: %d\n", priv->plug_irq);
+               return priv->plug_irq;
        }
 
        INIT_DELAYED_WORK(&priv->hs_jack.work, twl6040_accessory_work);