Merge "msm: cpp: Handling GET_INST_INFO ioctl for 64 bit kernel" (9af84459) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+23 −0

Original line number	Diff line number	Diff line
		@@ -2506,6 +2506,28 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file,
		case VIDIOC_MSM_CPP_LOAD_FIRMWARE32:
		cmd = VIDIOC_MSM_CPP_LOAD_FIRMWARE;
		break;
		case VIDIOC_MSM_CPP_GET_INST_INFO32:
		{
		struct cpp_device *cpp_dev = v4l2_get_subdevdata(sd);
		struct msm_cpp_frame_info32_t inst_info;
		struct v4l2_fh *vfh = NULL;
		uint32_t i;
		vfh = file->private_data;
		memset(&inst_info, 0, sizeof(struct msm_cpp_frame_info32_t));
		for (i = 0; i < MAX_ACTIVE_CPP_INSTANCE; i++) {
		if (cpp_dev->cpp_subscribe_list[i].vfh == vfh) {
		inst_info.inst_id = i;
		break;
		}
		}
		if (copy_to_user(
		(void __user *)kp_ioctl.ioctl_ptr, &inst_info,
		sizeof(struct msm_cpp_frame_info32_t))) {
		return -EINVAL;
		}
		cmd = VIDIOC_MSM_CPP_GET_INST_INFO;
		break;
		}
		case VIDIOC_MSM_CPP_FLUSH_QUEUE32:
		cmd = VIDIOC_MSM_CPP_FLUSH_QUEUE;
		break;
		@@ -2647,6 +2669,7 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file,
		case VIDIOC_MSM_CPP_GET_HW_INFO:
		case VIDIOC_MSM_CPP_CFG:
		case VIDIOC_MSM_CPP_GET_EVENTPAYLOAD:
		case VIDIOC_MSM_CPP_GET_INST_INFO:
		break;
		default:
		pr_err_ratelimited("%s: unsupported compat type :%d\n",