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

BugLink: https://bugs.launchpad.net/bugs/1951822
[ 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 <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20211015133619.4698-6-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index 205f81d27c30f518cdbb46b68cf9b4bd46fcd87e..6034e439d3132866eaa12a97d18b6f5b09bbb0dc 100644 (file)
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -1947,8 +1947,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);