Merge "msm: camera: Fix invalid pointer dereference" (5b87ae35) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1388,15 +1388,15 @@ static int msm_cci_probe(struct platform_device *pdev)
		}
		new_cci_dev->irq = platform_get_resource_byname(pdev,
		IORESOURCE_IRQ, "cci");
		CDBG("%s line %d cci irq start %d end %d\n", __func__,
		__LINE__,
		(int) new_cci_dev->irq->start,
		(int) new_cci_dev->irq->end);
		if (!new_cci_dev->irq) {
		CDBG("%s: no irq resource?\n", __func__);
		rc = -ENODEV;
		goto cci_no_resource;
		}
		CDBG("%s line %d cci irq start %d end %d\n", __func__,
		__LINE__,
		(int) new_cci_dev->irq->start,
		(int) new_cci_dev->irq->end);
		new_cci_dev->io = request_mem_region(new_cci_dev->mem->start,
		resource_size(new_cci_dev->mem), pdev->name);
		if (!new_cci_dev->io) {

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

+9 −8

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -125,14 +125,15 @@ int msm_flash_lm3642_led_release(struct msm_led_flash_ctrl_t *fctrl)
		struct msm_camera_sensor_board_info *flashdata = NULL;
		struct msm_camera_power_ctrl_t *power_info = NULL;

		flashdata = fctrl->flashdata;
		power_info = &flashdata->power_info;
		LM3642_DBG("%s:%d called\n", __func__, __LINE__);
		if (!fctrl) {
		pr_err("%s:%d fctrl NULL\n", __func__, __LINE__);
		return -EINVAL;
		}

		flashdata = fctrl->flashdata;
		power_info = &flashdata->power_info;
		LM3642_DBG("%s:%d called\n", __func__, __LINE__);

		gpio_set_value_cansleep(
		power_info->gpio_conf->gpio_num_info->
		gpio_num[SENSOR_GPIO_FL_NOW],
		@@ -153,15 +154,15 @@ int msm_flash_lm3642_led_off(struct msm_led_flash_ctrl_t *fctrl)
		struct msm_camera_sensor_board_info *flashdata = NULL;
		struct msm_camera_power_ctrl_t *power_info = NULL;

		flashdata = fctrl->flashdata;
		power_info = &flashdata->power_info;
		LM3642_DBG("%s:%d called\n", __func__, __LINE__);

		if (!fctrl) {
		pr_err("%s:%d fctrl NULL\n", __func__, __LINE__);
		return -EINVAL;
		}

		flashdata = fctrl->flashdata;
		power_info = &flashdata->power_info;
		LM3642_DBG("%s:%d called\n", __func__, __LINE__);

		if (fctrl->flash_i2c_client && fctrl->reg_setting) {
		rc = fctrl->flash_i2c_client->i2c_func_tbl->i2c_write_table(
		fctrl->flash_i2c_client,