xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown
2012-12-10 00:21:58 +09:00
parent c3b07b0773 77d19b10a4
commit 67fc455cc0
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/codecs/ak4535.c
View File

@@ -447,7 +447,7 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c,
if (ak4535 == NULL) if (ak4535 == NULL)
return -ENOMEM; return -ENOMEM;
ak4535->regmap = regmap_init_i2c(i2c, &ak4535_regmap); ak4535->regmap = devm_regmap_init_i2c(i2c, &ak4535_regmap);
if (IS_ERR(ak4535->regmap)) { if (IS_ERR(ak4535->regmap)) {
ret = PTR_ERR(ak4535->regmap); ret = PTR_ERR(ak4535->regmap);
dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret); 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, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_ak4535, &ak4535_dai, 1); &soc_codec_dev_ak4535, &ak4535_dai, 1);
if (ret != 0)
regmap_exit(ak4535->regmap);
return ret; return ret;
} }
static __devexit int ak4535_i2c_remove(struct i2c_client *client) static __devexit int ak4535_i2c_remove(struct i2c_client *client)
{ {
struct ak4535_priv *ak4535 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
regmap_exit(ak4535->regmap);
return 0; return 0;
} }