Merge "msm: sensor: Fix potential NULL ptr dereference" (f62852f1) · Commits · e / devices / android_kernel_xiaomi_markw

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -2019,15 +2019,15 @@ static int msm_cci_probe(struct platform_device *pdev)
		goto cci_no_resource;
		}
		new_cci_dev->irq = msm_camera_get_irq(pdev, "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) {
		pr_err("%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);
		rc = msm_camera_register_irq(pdev, new_cci_dev->irq,
		msm_cci_irq, IRQF_TRIGGER_RISING, "cci", new_cci_dev);
		if (rc < 0) {

+4 −1

Original line number	Diff line number	Diff line
		@@ -1112,7 +1112,10 @@ static long msm_csiphy_subdev_ioctl(struct v4l2_subdev *sd,
		{
		int rc = -ENOIOCTLCMD;
		struct csiphy_device *csiphy_dev = v4l2_get_subdevdata(sd);
		CDBG("%s:%d id %d\n", __func__, __LINE__, csiphy_dev->pdev->id);
		if (!csiphy_dev) {
		pr_err("%s:%d failed\n", __func__, __LINE__);
		return -EINVAL;
		}
		mutex_lock(&csiphy_dev->mutex);
		switch (cmd) {
		case VIDIOC_MSM_SENSOR_GET_SUBDEV_ID: