Merge "msm: camera: sensor: power_down eeprom if read fails" (2e280391) · Commits · e / devices / android_kernel_xiaomi_markw

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -562,7 +562,6 @@ static int eeprom_init_config(struct msm_eeprom_ctrl_t *e_ctrl,
		rc = eeprom_parse_memory_map(e_ctrl, memory_map_arr);
		if (rc < 0) {
		pr_err("%s::%d memory map parse failed\n", __func__, __LINE__);
		goto free_mem;
		}

		rc = msm_camera_power_down(power_info, e_ctrl->eeprom_device_type,
		@@ -570,7 +569,6 @@ static int eeprom_init_config(struct msm_eeprom_ctrl_t *e_ctrl,
		if (rc < 0) {
		pr_err("%s:%d Power down failed rc %d\n",
		__func__, __LINE__, rc);
		goto free_mem;
		}

		free_mem: