openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/lm49453' into asoc-next

This commit is contained in:
Mark Brown 2012-12-10 00:22:13 +09:00
parent 9a6806c0a7 2fadf6a861
commit edbe08adea
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/codecs/lm49453.c
View File

@ -1497,7 +1497,7 @@ static __devinit int lm49453_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, lm49453); i2c_set_clientdata(i2c, lm49453);
lm49453->regmap = regmap_init_i2c(i2c, &lm49453_regmap_config); lm49453->regmap = devm_regmap_init_i2c(i2c, &lm49453_regmap_config);
if (IS_ERR(lm49453->regmap)) { if (IS_ERR(lm49453->regmap)) {
ret = PTR_ERR(lm49453->regmap); ret = PTR_ERR(lm49453->regmap);
dev_err(&i2c->dev, "Failed to allocate register map: %d\n", dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
@ -1508,21 +1508,15 @@ static __devinit int lm49453_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_lm49453, &soc_codec_dev_lm49453,
lm49453_dai, ARRAY_SIZE(lm49453_dai)); lm49453_dai, ARRAY_SIZE(lm49453_dai));
if (ret < 0) { if (ret < 0)
dev_err(&i2c->dev, "Failed to register codec: %d\n", ret); dev_err(&i2c->dev, "Failed to register codec: %d\n", ret);
regmap_exit(lm49453->regmap);
return ret;
}
return ret; return ret;
} }
static int __devexit lm49453_i2c_remove(struct i2c_client *client) static int __devexit lm49453_i2c_remove(struct i2c_client *client)
{ {
struct lm49453_priv *lm49453 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
regmap_exit(lm49453->regmap);
return 0; return 0;
} }