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

Commit 0620a466 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sde: disable support for v4l2 event subscription"

parents 246e0ec5 915ac41f

drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c

+14 −2
Original line number Diff line number Diff line
@@ -2755,6 +2755,18 @@ static long sde_rotator_compat_ioctl32(struct file *file, 
}

#endif



static int sde_rotator_ctrl_subscribe_event(struct v4l2_fh *fh,

				const struct v4l2_event_subscription *sub)

{

	return -EINVAL;

}



static int sde_rotator_event_unsubscribe(struct v4l2_fh *fh,

			   const struct v4l2_event_subscription *sub)

{

	return -EINVAL;

}



/* V4l2 ioctl handlers */

static const struct v4l2_ioctl_ops sde_rotator_ioctl_ops = {

	.vidioc_querycap          = sde_rotator_querycap,
@@ -2779,8 +2791,8 @@ static const struct v4l2_ioctl_ops sde_rotator_ioctl_ops = { 
	.vidioc_s_parm            = sde_rotator_s_parm,

	.vidioc_default           = sde_rotator_private_ioctl,

	.vidioc_log_status        = v4l2_ctrl_log_status,

	.vidioc_subscribe_event   = v4l2_ctrl_subscribe_event,

	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,

	.vidioc_subscribe_event   = sde_rotator_ctrl_subscribe_event,

	.vidioc_unsubscribe_event = sde_rotator_event_unsubscribe,

};



/*