Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bccb3973 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Fixing NULL dereference in sensor code"

parents 9ec2328c e0a7fd1e

drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c

+12 −10
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ static int32_t msm_sensor_driver_i2c_probe(struct i2c_client *client, 
	if (s_ctrl->sensor_i2c_client != NULL) {

		s_ctrl->sensor_i2c_client->client = client;

		s_ctrl->sensordata->power_info.dev = &client->dev;

	}



		/* Get clocks information */

		rc = msm_camera_i2c_dev_get_clk_info(

			&s_ctrl->sensor_i2c_client->client->dev,
@@ -1250,9 +1250,11 @@ static int32_t msm_sensor_driver_i2c_probe(struct i2c_client *client, 
			&s_ctrl->sensordata->power_info.clk_ptr,

			&s_ctrl->sensordata->power_info.clk_info_size);

		if (rc < 0) {

		pr_err("failed: msm_camera_i2c_dev_get_clk_info rc %d", rc);

			pr_err("failed: msm_camera_i2c_dev_get_clk_info rc %d",

				rc);

			goto FREE_S_CTRL;

		}

	}

	return rc;

FREE_S_CTRL:

	kfree(s_ctrl);