| From 4efb46151820b4e95487970efecd5f5b4107becd Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 15 Oct 2021 14:36:08 +0100 |
| Subject: ASoC: cs42l42: Defer probe if request_threaded_irq() returns |
| EPROBE_DEFER |
| |
| From: Richard Fitzgerald <rf@opensource.cirrus.com> |
| |
| [ 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> |
| --- |
| sound/soc/codecs/cs42l42.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c |
| index 710b43205ea05..ebee58eca4d51 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); |
| |
| -- |
| 2.33.0 |
| |
