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

Commit 074689d6 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] ivtv: don't mess with vfd->debug 



This is now controlled by sysfs.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4a085168

drivers/media/video/ivtv/ivtv-ioctl.c

+0 −12
Original line number Diff line number Diff line
@@ -1830,18 +1830,6 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio, 
	return 0;

}



long ivtv_v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	struct video_device *vfd = video_devdata(filp);

	long ret;



	if (ivtv_debug & IVTV_DBGFLG_IOCTL)

		vfd->debug = V4L2_DEBUG_IOCTL | V4L2_DEBUG_IOCTL_ARG;

	ret = video_ioctl2(filp, cmd, arg);

	vfd->debug = 0;

	return ret;

}



static const struct v4l2_ioctl_ops ivtv_ioctl_ops = {

	.vidioc_querycap    		    = ivtv_querycap,

	.vidioc_s_audio     		    = ivtv_s_audio,

drivers/media/video/ivtv/ivtv-ioctl.h

+0 −1
Original line number Diff line number Diff line
@@ -31,6 +31,5 @@ void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id *std); 
void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id *std);

int ivtv_s_frequency(struct file *file, void *fh, struct v4l2_frequency *vf);

int ivtv_s_input(struct file *file, void *fh, unsigned int inp);

long ivtv_v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);



#endif

drivers/media/video/ivtv/ivtv-streams.c

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static const struct v4l2_file_operations ivtv_v4l2_enc_fops = { 
	.read = ivtv_v4l2_read,

	.write = ivtv_v4l2_write,

	.open = ivtv_v4l2_open,

	.unlocked_ioctl = ivtv_v4l2_ioctl,

	.unlocked_ioctl = video_ioctl2,

	.release = ivtv_v4l2_close,

	.poll = ivtv_v4l2_enc_poll,

};
@@ -60,7 +60,7 @@ static const struct v4l2_file_operations ivtv_v4l2_dec_fops = { 
	.read = ivtv_v4l2_read,

	.write = ivtv_v4l2_write,

	.open = ivtv_v4l2_open,

	.unlocked_ioctl = ivtv_v4l2_ioctl,

	.unlocked_ioctl = video_ioctl2,

	.release = ivtv_v4l2_close,

	.poll = ivtv_v4l2_dec_poll,

};