diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:15 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:15 +0900 |
| commit | 29998eb6180d7c7a45c48d629603b4ca2a7d19ec (patch) | |
| tree | aaee452ea76afb75fa57f5da5298475e55c19071 /sound | |
| parent | 4301aecbdfd2616c500ef629a463638dcd573a72 (diff) | |
| parent | 8f255e7ba30397bcf3c997dd3f34e24b85616176 (diff) | |
Merge remote-tracking branch 'asoc/topic/max9768' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/max9768.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/max9768.c b/sound/soc/codecs/max9768.c index 17b3ec2d05c..a777de6a1b2 100644 --- a/sound/soc/codecs/max9768.c +++ b/sound/soc/codecs/max9768.c @@ -187,7 +187,7 @@ static int __devinit max9768_i2c_probe(struct i2c_client *client, i2c_set_clientdata(client, max9768); - max9768->regmap = regmap_init_i2c(client, &max9768_i2c_regmap_config); + max9768->regmap = devm_regmap_init_i2c(client, &max9768_i2c_regmap_config); if (IS_ERR(max9768->regmap)) { err = PTR_ERR(max9768->regmap); goto err_gpio_free; @@ -195,12 +195,10 @@ static int __devinit max9768_i2c_probe(struct i2c_client *client, err = snd_soc_register_codec(&client->dev, &max9768_codec_driver, NULL, 0); if (err) - goto err_regmap_free; + goto err_gpio_free; return 0; - err_regmap_free: - regmap_exit(max9768->regmap); err_gpio_free: if (gpio_is_valid(max9768->shdn_gpio)) gpio_free(max9768->shdn_gpio); @@ -215,7 +213,6 @@ static int __devexit max9768_i2c_remove(struct i2c_client *client) struct max9768 *max9768 = i2c_get_clientdata(client); snd_soc_unregister_codec(&client->dev); - regmap_exit(max9768->regmap); if (gpio_is_valid(max9768->shdn_gpio)) gpio_free(max9768->shdn_gpio); |