diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-10-06 14:28:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-10-06 14:28:12 +0200 |
| commit | 3a4c155108a89e21cce2c467a6013bdcb42a6452 (patch) | |
| tree | dcad18950480f2c650c296d9c10d614c4e966e02 /sound/soc/codecs/rt5682-i2c.c | |
| parent | ccbd88be057a38531f835e8a04948ebf80cb0c5d (diff) | |
| parent | 1426b9ba7c453755d182ebf7e7f2367ba249dcf4 (diff) | |
Merge tag 'asoc-fix-v6.6-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: More fixes for v6.6
Some additional fixes for v6.6, some fairly unremarkable driver specific
ones and a couple of minor core fixes for error handling and improved
logging.
Diffstat (limited to 'sound/soc/codecs/rt5682-i2c.c')
| -rw-r--r-- | sound/soc/codecs/rt5682-i2c.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt5682-i2c.c b/sound/soc/codecs/rt5682-i2c.c index b05b4f73d8aa..fbad1ed06626 100644 --- a/sound/soc/codecs/rt5682-i2c.c +++ b/sound/soc/codecs/rt5682-i2c.c @@ -157,11 +157,6 @@ static int rt5682_i2c_probe(struct i2c_client *i2c) return ret; } - ret = devm_add_action_or_reset(&i2c->dev, rt5682_i2c_disable_regulators, - rt5682); - if (ret) - return ret; - ret = regulator_bulk_enable(ARRAY_SIZE(rt5682->supplies), rt5682->supplies); if (ret) { @@ -169,6 +164,11 @@ static int rt5682_i2c_probe(struct i2c_client *i2c) return ret; } + ret = devm_add_action_or_reset(&i2c->dev, rt5682_i2c_disable_regulators, + rt5682); + if (ret) + return ret; + ret = rt5682_get_ldo1(rt5682, &i2c->dev); if (ret) return ret; |