From: Richard Fitzgerald Date: Fri, 15 Oct 2021 13:36:08 +0000 (+0100) Subject: ASoC: cs42l42: Defer probe if request_threaded_irq() returns EPROBE_DEFER X-Git-Tag: Ubuntu-5.4.0-98.111~480 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=56d629edc2a91adc6543ff8f60b1b632d4698294;p=mirror_ubuntu-focal-kernel.git ASoC: cs42l42: Defer probe if request_threaded_irq() returns EPROBE_DEFER BugLink: https://bugs.launchpad.net/bugs/1953387 [ 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: 2c394ca79604 ("ASoC: Add support for CS42L42 codec") Signed-off-by: Richard Fitzgerald Link: https://lore.kernel.org/r/20211015133619.4698-6-rf@opensource.cirrus.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin Signed-off-by: Kamal Mostafa Signed-off-by: Kelsey Skunberg --- diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index 710b43205ea0..ebee58eca4d5 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -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);