From 1415f009293bf60fe17086108c9bcf8b74325f41 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 30 Jan 2012 20:01:53 +0000 Subject: [PATCH] --- yaml --- r: 305535 b: refs/heads/master c: 77caabaa74524dce5f83b93b8f0a6d0c1c5e860f h: refs/heads/master i: 305533: f7611b5436b5d36dd4b14c1073dac843a1b388e3 305531: a0ab865e1974b3a72fa7357ecca4722099ca3ccf 305527: b47b12015bddad0da4144079f574516aa606f990 305519: dbc7b9cec3310bdedfb3c68d5b417729c7bc60f4 305503: 844480a4a1409f800c59c35bad4830d8bbce131c 305471: 9d7e2058b00a5655514059397374dca047b9fdf5 305407: 41e60bf5518ac088a48e5450ed001cdb5514f443 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm5100.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1e1b8a86b5a2..44a7549e565f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e06ab3b8e82c89a8ada25f61fbd9f02d6ca3103f +refs/heads/master: 77caabaa74524dce5f83b93b8f0a6d0c1c5e860f diff --git a/trunk/sound/soc/codecs/wm5100.c b/trunk/sound/soc/codecs/wm5100.c index b9c185ce64e4..0594636b9107 100644 --- a/trunk/sound/soc/codecs/wm5100.c +++ b/trunk/sound/soc/codecs/wm5100.c @@ -2454,7 +2454,7 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c, wm5100->dev = &i2c->dev; - wm5100->regmap = regmap_init_i2c(i2c, &wm5100_regmap); + wm5100->regmap = devm_regmap_init_i2c(i2c, &wm5100_regmap); if (IS_ERR(wm5100->regmap)) { ret = PTR_ERR(wm5100->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", @@ -2479,7 +2479,7 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c, if (ret != 0) { dev_err(&i2c->dev, "Failed to request core supplies: %d\n", ret); - goto err_regmap; + goto err; } ret = regulator_bulk_enable(ARRAY_SIZE(wm5100->core_supplies), @@ -2487,7 +2487,7 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c, if (ret != 0) { dev_err(&i2c->dev, "Failed to enable core supplies: %d\n", ret); - goto err_regmap; + goto err; } if (wm5100->pdata.ldo_ena) { @@ -2660,8 +2660,6 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c, err_enable: regulator_bulk_disable(ARRAY_SIZE(wm5100->core_supplies), wm5100->core_supplies); -err_regmap: - regmap_exit(wm5100->regmap); err: return ret; } @@ -2682,7 +2680,6 @@ static __devexit int wm5100_i2c_remove(struct i2c_client *i2c) gpio_set_value_cansleep(wm5100->pdata.ldo_ena, 0); gpio_free(wm5100->pdata.ldo_ena); } - regmap_exit(wm5100->regmap); return 0; }