Merge "msm: camera: add free allocated memory in case of error" (34a53f8d) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,7 @@ static int32_t msm_flash_i2c_init(
		sizeof(struct msm_sensor_power_setting_array32))) {
		pr_err("%s copy_from_user failed %d\n",
		__func__, __LINE__);
		kfree(power_setting_array32);
		return -EFAULT;
		}

		@@ -955,6 +956,7 @@ static int32_t msm_flash_platform_probe(struct platform_device *pdev)
		if (rc < 0) {
		pr_err("%s:%d msm_flash_get_dt_data failed\n",
		__func__, __LINE__);
		kfree(flash_ctrl);
		return -EINVAL;
		}