Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67fc455c authored by Mark Brown's avatar Mark Brown
Browse files

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

parents c3b07b07 77d19b10

sound/soc/codecs/ak4535.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

}