diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:35:19 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:35:19 +0900 |
| commit | 39a329b14e34ae151c2cce05e5365e90daa4a03b (patch) | |
| tree | f5edc9056690104b0356bdfe3eb90679a7ed614c /sound | |
| parent | 54fc5a1ad81d3c7c7553b6d3dff0fc51d8ac2bbd (diff) | |
| parent | 5851e9b89d9a3dc38fbd68efac95fac7f7f85b5a (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8350.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index a4cae060bf26..32b8f0852f6e 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -1500,7 +1500,7 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) for (i = 0; i < ARRAY_SIZE(supply_names); i++) priv->supplies[i].supply = supply_names[i]; - ret = regulator_bulk_get(wm8350->dev, ARRAY_SIZE(priv->supplies), + ret = devm_regulator_bulk_get(wm8350->dev, ARRAY_SIZE(priv->supplies), priv->supplies); if (ret != 0) return ret; @@ -1607,8 +1607,6 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec) wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA); - regulator_bulk_free(ARRAY_SIZE(priv->supplies), priv->supplies); - return 0; } |