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

Commit de43e759 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Greg Kroah-Hartman
Browse files

ASoC: cs42l42: Defer probe if request_threaded_irq() returns EPROBE_DEFER 



[ Upstream commit 0306988789d9d91a18ff70bd2bf165d3ae0ef1dd ]

The driver can run without an interrupt so if devm_request_threaded_irq()
failed, the probe() just carried on. But if this was EPROBE_DEFER the
driver would continue without an interrupt instead of deferring to wait
for the interrupt to become available.

Fixes: 2c394ca7 ("ASoC: Add support for CS42L42 codec")
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20211015133619.4698-6-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f00ff535

sound/soc/codecs/cs42l42.c

+3 −2
Original line number Diff line number Diff line
@@ -1798,8 +1798,9 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, 
			NULL, cs42l42_irq_thread,

			IRQF_ONESHOT | IRQF_TRIGGER_LOW,

			"cs42l42", cs42l42);



	if (ret != 0)

	if (ret == -EPROBE_DEFER)

		goto err_disable;

	else if (ret != 0)

		dev_err(&i2c_client->dev,

			"Failed to request IRQ: %d\n", ret);