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

Commit e480f2d1 authored by Alan Kwong's avatar Alan Kwong Committed by Gerrit - the friendly Code Review server
Browse files

msm: sde: disable support for v4l2 event subscription 



V4l2 event subscription is not used by rotator, and
default implementation on 4.9 is causing failure during
file release. Disable v4l2 event subscription for rotator
to avoid invalid file release.

Change-Id: I486f2eba7112852a1c818efeeb86033f17139b33
Signed-off-by: default avatarAlan Kwong <akwong@codeaurora.org>
parent ba696c10

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

+14 −2
Original line number Diff line number Diff line
@@ -2018,6 +2018,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,
@@ -2044,8 +2056,8 @@ static const struct v4l2_ioctl_ops sde_rotator_ioctl_ops = { 
	.vidioc_s_priority	  = sde_rotator_s_priority,

	.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,

};



/*