Merge "msm: camera: fix camera crash after daemon reboot" (6e3924e6) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -127,12 +127,6 @@ static int eeprom_config_read_cal_data(struct msm_eeprom_ctrl_t *e_ctrl,
		e_ctrl->cal_data.mapdata,
		cdata->cfg.read_data.num_bytes);

		/* should only be called once. free kernel resource */
		if (!rc) {
		kfree(e_ctrl->cal_data.mapdata);
		kfree(e_ctrl->cal_data.map);
		memset(&e_ctrl->cal_data, 0, sizeof(e_ctrl->cal_data));
		}
		return rc;
		}