[PATCH] Wrong returned value of __video_ioctl2()

[PATCH] Wrong returned value of __video_ioctl2()

[Jean-Francois Moine]

This patch suppresses the warning on setting the dev_fops unlocked_ioctl
function to __video_ioctl2.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>

diff -r c7b89ff3a3df linux/drivers/media/video/v4l2-ioctl.c
--- a/linux/drivers/media/video/v4l2-ioctl.c	Tue Dec 23 19:57:17 2008 +0100
+++ b/linux/drivers/media/video/v4l2-ioctl.c	Tue Dec 23 20:42:08 2008 +0100
@@ -1853,7 +1853,7 @@
 	return ret;
 }
 
-int __video_ioctl2(struct file *file,
+long __video_ioctl2(struct file *file,
 	       unsigned int cmd, unsigned long arg)
 {
 	char	sbuf[128];
diff -r c7b89ff3a3df linux/include/media/v4l2-ioctl.h
--- a/linux/include/media/v4l2-ioctl.h	Tue Dec 23 19:57:17 2008 +0100
+++ b/linux/include/media/v4l2-ioctl.h	Tue Dec 23 20:42:08 2008 +0100
@@ -297,7 +297,7 @@
 /* Standard handlers for V4L ioctl's */
 
 /* This prototype is used on fops.unlocked_ioctl */
-extern int __video_ioctl2(struct file *file,
+extern long __video_ioctl2(struct file *file,
 			unsigned int cmd, unsigned long arg);
 
 /* This prototype is used on fops.ioctl

-- 
Ken ar c'hentañ |             ** Breizh ha Linux atav! **
Jef             |               http://moinejf.free.fr/


--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

Re: [PATCH] Wrong returned value of __video_ioctl2()

[Hans Verkuil]

On Tuesday 23 December 2008 20:54:38 Jean-Francois Moine wrote:
> This patch suppresses the warning on setting the dev_fops unlocked_ioctl
> function to __video_ioctl2.
>
> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>

Hi Jean-Francois,

This patch clashes with an other pull request from me where the whole 
__video_ioctl2 function disappears.

But the prototype is indeed wrong and so I will go through my code and 
ensure that all the ioctl return types are long.

Thank you for bringing this to our attention and I'll make sure to fix these 
prototypes.

Regards,

	Hans

>
> diff -r c7b89ff3a3df linux/drivers/media/video/v4l2-ioctl.c
> --- a/linux/drivers/media/video/v4l2-ioctl.c	Tue Dec 23 19:57:17 2008
> +0100 +++ b/linux/drivers/media/video/v4l2-ioctl.c	Tue Dec 23 20:42:08
> 2008 +0100 @@ -1853,7 +1853,7 @@
>  	return ret;
>  }
>
> -int __video_ioctl2(struct file *file,
> +long __video_ioctl2(struct file *file,
>  	       unsigned int cmd, unsigned long arg)
>  {
>  	char	sbuf[128];
> diff -r c7b89ff3a3df linux/include/media/v4l2-ioctl.h
> --- a/linux/include/media/v4l2-ioctl.h	Tue Dec 23 19:57:17 2008 +0100
> +++ b/linux/include/media/v4l2-ioctl.h	Tue Dec 23 20:42:08 2008 +0100
> @@ -297,7 +297,7 @@
>  /* Standard handlers for V4L ioctl's */
>
>  /* This prototype is used on fops.unlocked_ioctl */
> -extern int __video_ioctl2(struct file *file,
> +extern long __video_ioctl2(struct file *file,
>  			unsigned int cmd, unsigned long arg);
>
>  /* This prototype is used on fops.ioctl



-- 
Hans Verkuil - video4linux developer - sponsored by TANDBERG

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list