Commit 1d94aa36 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: video_ioctl2: do not replace arg with NULL for _IO() ioctls 



If the ioctl was defined without direction (e.g. _IO('o', 25)), then
the arg as passed to vidioc_default was NULL instead of the original
argument.

Several ioctls in e.g. include/linux/dvb/video.h and audio.h use this type
of ioctl to pass simple numerical values to the driver.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ea64f8c2

drivers/media/video/v4l2-ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -2006,7 +2006,7 @@ long video_ioctl2(struct file *file, 
{

	char	sbuf[128];

	void    *mbuf = NULL;

	void	*parg = NULL;

	void	*parg = (void *)arg;

	long	err  = -EINVAL;

	int     is_ext_ctrl;

	size_t  ctrls_size = 0;