Skip to content

Commit

Permalink
V4L/DVB (10110): v4l2-ioctl: Fix warnings when using .unlocked_ioctl …
Browse files Browse the repository at this point in the history
…= __video_ioctl2

This patch fixes this warning:

drivers/media/video/gspca/gspca.c:1811: warning: initialization from incompatible pointer type

The reason is that the returned argument should be a long, not an
integer.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Dec 30, 2008
1 parent 902571a commit 92ab788
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/media/video/v4l2-ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1852,7 +1852,7 @@ static int __video_do_ioctl(struct file *file,
return ret;
}

int __video_ioctl2(struct file *file,
long __video_ioctl2(struct file *file,
unsigned int cmd, unsigned long arg)
{
char sbuf[128];
Expand Down
2 changes: 1 addition & 1 deletion include/media/v4l2-ioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ extern int video_usercopy(struct file *file, unsigned int cmd,
/* 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
Expand Down

0 comments on commit 92ab788

Please sign in to comment.