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

Commit 4d296bb8 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: Fix a copy size for CSID configuration"

parents 6976ec56 91556a47

drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c

+3 −5
Original line number Diff line number Diff line
@@ -340,8 +340,7 @@ static int32_t msm_csid_cmd(struct csid_device *csid_dev, void *arg) 
			break;

		}

		for (i = 0; i < csid_params.lut_params.num_cid; i++) {

			vc_cfg = kzalloc(csid_params.lut_params.num_cid *

				sizeof(struct msm_camera_csid_vc_cfg),

			vc_cfg = kzalloc(sizeof(struct msm_camera_csid_vc_cfg),

			    GFP_KERNEL);

			if (!vc_cfg) {

				pr_err("%s: %d failed\n", __func__, __LINE__);
@@ -352,8 +351,7 @@ static int32_t msm_csid_cmd(struct csid_device *csid_dev, void *arg) 
			}

			if (copy_from_user(vc_cfg,

				(void *)csid_params.lut_params.vc_cfg[i],

				(csid_params.lut_params.num_cid *

				sizeof(struct msm_camera_csid_vc_cfg)))) {

				sizeof(struct msm_camera_csid_vc_cfg))) {

				pr_err("%s: %d failed\n", __func__, __LINE__);

				kfree(vc_cfg);

				for (i--; i >= 0; i--)