diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:26 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:26 +0900 |
| commit | 65c62837a7410ffef5c4d29dd0a866956795ce02 (patch) | |
| tree | 2fb9dfe4cba6fd898d409835e6734e8df57063cb /sound/soc | |
| parent | 47f07b77f23224fd8414fe68cb937be410d4f946 (diff) | |
| parent | 95a5b240e40fc7ab226e59fb8298a2ca4faf7657 (diff) | |
| download | linux-65c62837a7410ffef5c4d29dd0a866956795ce02.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8400.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 5d277a915f81..262c44082eb0 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -1373,7 +1373,7 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) codec->control_data = priv->wm8400 = wm8400; priv->codec = codec; - ret = regulator_bulk_get(wm8400->dev, + ret = devm_regulator_bulk_get(wm8400->dev, ARRAY_SIZE(power), &power[0]); if (ret != 0) { dev_err(codec->dev, "Failed to get regulators: %d\n", ret); @@ -1398,15 +1398,9 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) snd_soc_write(codec, WM8400_LEFT_OUTPUT_VOLUME, 0x50 | (1<<8)); snd_soc_write(codec, WM8400_RIGHT_OUTPUT_VOLUME, 0x50 | (1<<8)); - if (!schedule_work(&priv->work)) { - ret = -EINVAL; - goto err_regulator; - } + if (!schedule_work(&priv->work)) + return -EINVAL; return 0; - -err_regulator: - regulator_bulk_free(ARRAY_SIZE(power), power); - return ret; } static int wm8400_codec_remove(struct snd_soc_codec *codec) @@ -1417,8 +1411,6 @@ static int wm8400_codec_remove(struct snd_soc_codec *codec) snd_soc_write(codec, WM8400_POWER_MANAGEMENT_1, reg & (~WM8400_CODEC_ENA)); - regulator_bulk_free(ARRAY_SIZE(power), power); - return 0; } |