Commit f3334bcb authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10816): cx88: Don't need to zero ioctl parameter fields 



The v4l2 core code in v4l2_ioctl will zero out the structure the driver is
supposed to fill in for read-only ioctls.  For read/write ioctls, all the
fields which aren't supplied from userspace will be zeroed out.

Zeroing code is removed from enum_input and g_tuner.

Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 522a5f14

drivers/media/video/cx88/cx88-video.c

+1 −5
Original line number Diff line number Diff line
@@ -1277,15 +1277,12 @@ int cx88_enum_input (struct cx88_core *core,struct v4l2_input *i) 
		[ CX88_VMUX_DVB        ] = "DVB",

		[ CX88_VMUX_DEBUG      ] = "for debug only",

	};

	unsigned int n;

	unsigned int n = i->index;



	n = i->index;

	if (n >= 4)

		return -EINVAL;

	if (0 == INPUT(n).type)

		return -EINVAL;

	memset(i,0,sizeof(*i));

	i->index = n;

	i->type  = V4L2_INPUT_TYPE_CAMERA;

	strcpy(i->name,iname[INPUT(n).type]);

	if ((CX88_VMUX_TELEVISION == INPUT(n).type) ||
@@ -1521,7 +1518,6 @@ static int radio_g_audio (struct file *file, void *priv, struct v4l2_audio *a) 
	if (unlikely(a->index))

		return -EINVAL;



	memset(a,0,sizeof(*a));

	strcpy(a->name,"Radio");

	return 0;

}