Skip to content

Commit

Permalink
ASoC: twl6040: fix error return code in twl6040_probe()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gustavo A. R. Silva authored and Mark Brown committed Jul 17, 2017
1 parent 5771a8c commit cfe267d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/codecs/twl6040.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit cfe267d

Please sign in to comment.