Merge "msm: camera: Avoid null pointer dereferencing" (846d3fda) · Commits · e / devices / android_kernel_xiaomi_markw

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -1250,6 +1250,10 @@ static int msm_eeprom_spi_remove(struct spi_device *sdev)
		return 0;
		}

		if (!e_ctrl->eboard_info) {
		pr_err("%s: eboard_info is NULL\n", __func__);
		return 0;
		}
		msm_camera_put_clk_info(e_ctrl->pdev,
		&e_ctrl->eboard_info->power_info.clk_info,
		&e_ctrl->eboard_info->power_info.clk_ptr,
		@@ -1765,6 +1769,10 @@ static int msm_eeprom_platform_remove(struct platform_device *pdev)
		return 0;
		}

		if (!e_ctrl->eboard_info) {
		pr_err("%s: eboard_info is NULL\n", __func__);
		return 0;
		}
		msm_camera_put_clk_info(e_ctrl->pdev,
		&e_ctrl->eboard_info->power_info.clk_info,
		&e_ctrl->eboard_info->power_info.clk_ptr,