Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfe267da authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Mark Brown
Browse files

ASoC: twl6040: fix error return code in twl6040_probe() 



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: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5771a8c0

sound/soc/codecs/twl6040.c

+2 −2
Original line number Diff line number Diff line
@@ -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);