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

Commit 4d75dd61 authored by Axel Lin's avatar Axel Lin Committed by Samuel Ortiz
Browse files

mfd: Add missing regmap_exit to free a previously allocated da9052 register map 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent d48f411c

drivers/mfd/da9052-i2c.c

+5 −2
Original line number Diff line number Diff line
@@ -74,14 +74,16 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client, 


	ret = da9052_i2c_enable_multiwrite(da9052);

	if (ret < 0)

		goto err;

		goto err_regmap;



	ret = da9052_device_init(da9052, id->driver_data);

	if (ret != 0)

		goto err;

		goto err_regmap;



	return 0;



err_regmap:

	regmap_exit(da9052->regmap);

err:

	kfree(da9052);

	return ret;
@@ -92,6 +94,7 @@ static int da9052_i2c_remove(struct i2c_client *client) 
	struct da9052 *da9052 = i2c_get_clientdata(client);



	da9052_device_exit(da9052);

	regmap_exit(da9052->regmap);

	kfree(da9052);



	return 0;

drivers/mfd/da9052-spi.c

+4 −1
Original line number Diff line number Diff line
@@ -52,10 +52,12 @@ static int da9052_spi_probe(struct spi_device *spi) 


	ret = da9052_device_init(da9052, id->driver_data);

	if (ret != 0)

		goto err;

		goto err_regmap;



	return 0;



err_regmap:

	regmap_exit(da9052->regmap);

err:

	kfree(da9052);

	return ret;
@@ -66,6 +68,7 @@ static int da9052_spi_remove(struct spi_device *spi) 
	struct da9052 *da9052 = dev_get_drvdata(&spi->dev);



	da9052_device_exit(da9052);

	regmap_exit(da9052->regmap);

	kfree(da9052);



	return 0;