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

Commit d718c651 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: eeprom: set platform driver data to null" into dev/msm-4.14-camx

parents d03757cd ef45a0b6

drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_dev.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -261,7 +261,10 @@ static int cam_eeprom_i2c_driver_remove(struct i2c_client *client) 
	for (i = 0; i < soc_info->num_clk; i++)

	for (i = 0; i < soc_info->num_clk; i++)

		devm_clk_put(soc_info->dev, soc_info->clk[i]);

		devm_clk_put(soc_info->dev, soc_info->clk[i]);





	mutex_destroy(&(e_ctrl->eeprom_mutex));

	kfree(soc_private);

	kfree(soc_private);

	kfree(e_ctrl->io_master_info.cci_client);

	v4l2_set_subdevdata(&e_ctrl->v4l2_dev_str.sd, NULL);

	kfree(e_ctrl);

	kfree(e_ctrl);





	return 0;

	return 0;
@@ -392,6 +395,8 @@ static int cam_eeprom_spi_driver_remove(struct spi_device *sdev) 
		kfree(soc_private->power_info.gpio_num_info);

		kfree(soc_private->power_info.gpio_num_info);

		kfree(soc_private);

		kfree(soc_private);

	}

	}

	mutex_destroy(&(e_ctrl->eeprom_mutex));

	v4l2_set_subdevdata(&e_ctrl->v4l2_dev_str.sd, NULL);

	kfree(e_ctrl);

	kfree(e_ctrl);





	return 0;

	return 0;
@@ -487,8 +492,11 @@ static int cam_eeprom_platform_driver_remove(struct platform_device *pdev) 
	for (i = 0; i < soc_info->num_clk; i++)

	for (i = 0; i < soc_info->num_clk; i++)

		devm_clk_put(soc_info->dev, soc_info->clk[i]);

		devm_clk_put(soc_info->dev, soc_info->clk[i]);





	mutex_destroy(&(e_ctrl->eeprom_mutex));

	kfree(soc_info->soc_private);

	kfree(soc_info->soc_private);

	kfree(e_ctrl->io_master_info.cci_client);

	kfree(e_ctrl->io_master_info.cci_client);

	platform_set_drvdata(pdev, NULL);

	v4l2_set_subdevdata(&e_ctrl->v4l2_dev_str.sd, NULL);

	kfree(e_ctrl);

	kfree(e_ctrl);

	return 0;

	return 0;

}

}