Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-30 16:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown 2012-12-10 00:22:05 +09:00
commit ac0d9c9001
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sound/soc/codecs/da7210.c
View File

@ -1231,7 +1231,7 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, da7210); i2c_set_clientdata(i2c, da7210);
da7210->regmap = regmap_init_i2c(i2c, &da7210_regmap_config_i2c); da7210->regmap = devm_regmap_init_i2c(i2c, &da7210_regmap_config_i2c);
if (IS_ERR(da7210->regmap)) { if (IS_ERR(da7210->regmap)) {
ret = PTR_ERR(da7210->regmap); ret = PTR_ERR(da7210->regmap);
dev_err(&i2c->dev, "regmap_init() failed: %d\n", ret); dev_err(&i2c->dev, "regmap_init() failed: %d\n", ret);
@ -1245,24 +1245,15 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_da7210, &da7210_dai, 1); &soc_codec_dev_da7210, &da7210_dai, 1);
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);
goto err_regmap;
}
return ret;
err_regmap:
regmap_exit(da7210->regmap);
return ret; return ret;
} }
static int __devexit da7210_i2c_remove(struct i2c_client *client) static int __devexit da7210_i2c_remove(struct i2c_client *client)
{ {
struct da7210_priv *da7210 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
regmap_exit(da7210->regmap);
return 0; return 0;
} }
@ -1346,24 +1337,15 @@ static int __devinit da7210_spi_probe(struct spi_device *spi)
if (ret != 0) if (ret != 0)
dev_warn(&spi->dev, "Failed to apply regmap patch: %d\n", ret); dev_warn(&spi->dev, "Failed to apply regmap patch: %d\n", ret);
ret = snd_soc_register_codec(&spi->dev, ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_da7210, &da7210_dai, 1); &soc_codec_dev_da7210, &da7210_dai, 1);
if (ret < 0)
goto err_regmap;
return ret;
err_regmap:
regmap_exit(da7210->regmap);
return ret; return ret;
} }
static int __devexit da7210_spi_remove(struct spi_device *spi) static int __devexit da7210_spi_remove(struct spi_device *spi)
{ {
struct da7210_priv *da7210 = spi_get_drvdata(spi);
snd_soc_unregister_codec(&spi->dev); snd_soc_unregister_codec(&spi->dev);
regmap_exit(da7210->regmap);
return 0; return 0;
} }