diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-10-19 14:51:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-10-19 14:51:12 +0200 |
| commit | 87543ce5030a17ff5056668d7e6c433168c63bb5 (patch) | |
| tree | bf0ed8d7cb63986bd2ca59107cb8729f12b1d38a /sound/soc/codecs/rt5682-i2c.c | |
| parent | 2b17b489e47a956c8e93c8f1bcabb0343c851d90 (diff) | |
| parent | 8e13caa2150b5a1287a1900952d3d7e04363f921 (diff) | |
Merge branch 'for-linus' into for-next
For applying HD-audio EPROBE_DEFER series cleanly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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; |