diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 04:34:54 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 04:34:54 (GMT) |
| commit | c298d1850372bc747626693e1d368e6b37bf5c21 (patch) | |
| tree | 8940ed16d48e4b37ced8d4827d799bc16324a4a8 /sound | |
| parent | 0c1c73376b0df5f19dac40cfbaa50f10404ad81b (diff) | |
| parent | 77d19b10a45504af3810681d33b9ebfdb3a57a35 (diff) | |
| download | linux-c298d1850372bc747626693e1d368e6b37bf5c21.tar.xz | |
Merge remote-tracking branch 'asoc/topic/ak4535' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/ak4535.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index 618fdc3..fc55810 100644 --- a/sound/soc/codecs/ak4535.c +++ b/sound/soc/codecs/ak4535.c @@ -447,7 +447,7 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c, if (ak4535 == NULL) return -ENOMEM; - ak4535->regmap = regmap_init_i2c(i2c, &ak4535_regmap); + ak4535->regmap = devm_regmap_init_i2c(i2c, &ak4535_regmap); if (IS_ERR(ak4535->regmap)) { ret = PTR_ERR(ak4535->regmap); dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret); @@ -458,18 +458,13 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_ak4535, &ak4535_dai, 1); - if (ret != 0) - regmap_exit(ak4535->regmap); return ret; } static __devexit int ak4535_i2c_remove(struct i2c_client *client) { - struct ak4535_priv *ak4535 = i2c_get_clientdata(client); - snd_soc_unregister_codec(&client->dev); - regmap_exit(ak4535->regmap); return 0; } |