From ec2b9580ae75aa6a9cfdd8f78c5b368c63eba6e8 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 21 Jan 2012 22:18:52 +0000 Subject: [PATCH] --- yaml --- r: 293271 b: refs/heads/master c: 24e0c57b8ed2b3a9fe07c07edc1c0062df5be8bf h: refs/heads/master i: 293269: 98a0cf6d86c8890cd7f3c6fa8e9f059a475c28b1 293267: dec9c5b67f56744d991a5027f69c9299381938f0 293263: ddda368169e68a42590a471259beee72a17c20fb v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8996.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 62fb198a8cbb..cb03b2ef1343 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a086e4cc423c5f89ea7b2e25c29800057477b58 +refs/heads/master: 24e0c57b8ed2b3a9fe07c07edc1c0062df5be8bf diff --git a/trunk/sound/soc/codecs/wm8996.c b/trunk/sound/soc/codecs/wm8996.c index 42af0a396839..10f41c888884 100644 --- a/trunk/sound/soc/codecs/wm8996.c +++ b/trunk/sound/soc/codecs/wm8996.c @@ -3153,8 +3153,8 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, for (i = 0; i < ARRAY_SIZE(wm8996->supplies); i++) wm8996->supplies[i].supply = wm8996_supply_names[i]; - ret = regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8996->supplies), - wm8996->supplies); + ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8996->supplies), + wm8996->supplies); if (ret != 0) { dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret); goto err_gpio; @@ -3164,7 +3164,7 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, wm8996->supplies); if (ret != 0) { dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret); - goto err_get; + goto err_gpio; } if (wm8996->pdata.ldo_ena > 0) { @@ -3226,8 +3226,6 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, if (wm8996->pdata.ldo_ena > 0) gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0); regulator_bulk_disable(ARRAY_SIZE(wm8996->supplies), wm8996->supplies); -err_get: - regulator_bulk_free(ARRAY_SIZE(wm8996->supplies), wm8996->supplies); err_gpio: if (wm8996->pdata.ldo_ena > 0) gpio_free(wm8996->pdata.ldo_ena); @@ -3242,7 +3240,6 @@ static __devexit int wm8996_i2c_remove(struct i2c_client *client) snd_soc_unregister_codec(&client->dev); wm8996_free_gpio(wm8996); - regulator_bulk_free(ARRAY_SIZE(wm8996->supplies), wm8996->supplies); regmap_exit(wm8996->regmap); if (wm8996->pdata.ldo_ena > 0) { gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0);