Merge "msm: camera: isp: Fix invalid type conversion" (0e7565c3) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

+22 −20

Original line number	Diff line number	Diff line
		@@ -212,8 +212,10 @@ static long msm_ispif_cmd_ext(struct v4l2_subdev *sd,
		long rc = 0;
		struct ispif_device *ispif =
		(struct ispif_device *)v4l2_get_subdevdata(sd);
		struct ispif_cfg_data_ext pcdata;
		struct ispif_cfg_data_ext pcdata = {0};
		struct msm_ispif_param_data_ext *params = NULL;

		if (is_compat_task()) {
		#ifdef CONFIG_COMPAT
		struct ispif_cfg_data_ext_32 *pcdata32 =
		(struct ispif_cfg_data_ext_32 *)arg;
		@@ -225,8 +227,8 @@ static long msm_ispif_cmd_ext(struct v4l2_subdev *sd,
		pcdata.cfg_type = pcdata32->cfg_type;
		pcdata.size = pcdata32->size;
		pcdata.data = compat_ptr(pcdata32->data);

		#else
		#endif
		} else {
		struct ispif_cfg_data_ext *pcdata64 =
		(struct ispif_cfg_data_ext *)arg;

		@@ -237,7 +239,7 @@ static long msm_ispif_cmd_ext(struct v4l2_subdev *sd,
		pcdata.cfg_type = pcdata64->cfg_type;
		pcdata.size = pcdata64->size;
		pcdata.data = pcdata64->data;
		#endif
		}
		if (pcdata.size != sizeof(struct msm_ispif_param_data_ext)) {
		pr_err("%s: payload size mismatch\n", __func__);
		return -EINVAL;