diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-05-06 22:51:52 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-06 22:51:52 +0900 |
| commit | 7f5a466f2ea1115a4a73d987b7b6a73d23475305 (patch) | |
| tree | f7e9399912fae24b6364f7e8b2e327623324f516 /sound/soc/codecs/rt5682.c | |
| parent | Linux 5.1 (diff) | |
| parent | ASoC: skip hw_free on codec dai for which the stream is invalid (diff) | |
| download | linux-dev-7f5a466f2ea1115a4a73d987b7b6a73d23475305.tar.xz linux-dev-7f5a466f2ea1115a4a73d987b7b6a73d23475305.zip | |
Merge branch 'asoc-5.1' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/rt5682.c')
| -rw-r--r-- | sound/soc/codecs/rt5682.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 86a7fa31c294..505fb3d7b1c5 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -2588,6 +2588,7 @@ static int rt5682_i2c_probe(struct i2c_client *i2c, rt5682_reset(rt5682->regmap); + mutex_init(&rt5682->calibrate_mutex); rt5682_calibrate(rt5682); ret = regmap_multi_reg_write(rt5682->regmap, patch_list, @@ -2654,7 +2655,6 @@ static int rt5682_i2c_probe(struct i2c_client *i2c, INIT_DELAYED_WORK(&rt5682->jd_check_work, rt5682_jd_check_handler); - mutex_init(&rt5682->calibrate_mutex); if (i2c->irq) { ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL, |