diff options
author | Mark Brown <broonie@kernel.org> | 2023-06-16 16:55:20 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-06-16 16:55:20 +0300 |
commit | 1a32b4b9a6229233de70cec28fb5a87fabac2c41 (patch) | |
tree | 773f8a5c40ac3176d2a0613c51fc4cd333b1bcc2 /sound/soc/codecs/rt5682-i2c.c | |
parent | 928314eb06709e3861ce3e2c7e9ef3f83ba8691b (diff) | |
parent | f9fd804aa0a36f15a35ca070ec4c52650876cc29 (diff) | |
download | linux-1a32b4b9a6229233de70cec28fb5a87fabac2c41.tar.xz |
ASoC: Merge fixes due to dependencies
So we can apply the tlv320aic3xxx DT conversion.
Diffstat (limited to 'sound/soc/codecs/rt5682-i2c.c')
-rw-r--r-- | sound/soc/codecs/rt5682-i2c.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5682-i2c.c b/sound/soc/codecs/rt5682-i2c.c index a88fcf507386..1742efe8dbcf 100644 --- a/sound/soc/codecs/rt5682-i2c.c +++ b/sound/soc/codecs/rt5682-i2c.c @@ -266,7 +266,9 @@ static int rt5682_i2c_probe(struct i2c_client *i2c) ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL, rt5682_irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "rt5682", rt5682); - if (ret) + if (!ret) + rt5682->irq = i2c->irq; + else dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret); } |