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

Commit e61bf1c5 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: Handle null pointer derference"

parents 8fcc58a5 f48ecd89
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -682,13 +682,13 @@ static int32_t msm_cci_init(struct v4l2_subdev *sd,
	enum cci_i2c_master_t master;

	cci_dev = v4l2_get_subdevdata(sd);
	cci_dev->reg_ptr = NULL;
	if (!cci_dev || !c_ctrl) {
		pr_err("%s:%d failed: invalid params %p %p\n", __func__,
			__LINE__, cci_dev, c_ctrl);
		rc = -ENOMEM;
		return rc;
	}
	cci_dev->reg_ptr = NULL;
	if (cci_dev->ref_count++) {
		CDBG("%s ref_count %d\n", __func__, cci_dev->ref_count);
		master = c_ctrl->cci_info->cci_i2c_master;