Skip to content

Commit

Permalink
Staging: go7007: fixes due to video_usercopy api change
Browse files Browse the repository at this point in the history
video_usercopy() just changed its arguments, so fix up the go7007 driver
to properly build.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Jan 6, 2009
1 parent 238c6d5 commit 4f7ddec
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/staging/go7007/go7007-v4l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,7 @@ static int clip_to_modet_map(struct go7007 *go, int region,
return 0;
}

static int go7007_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)
static long go7007_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct go7007_file *gofh = file->private_data;
struct go7007 *go = gofh->go;
Expand Down Expand Up @@ -1335,7 +1334,7 @@ static int go7007_ioctl(struct inode *inode, struct file *file,
if (gofh->go->status != STATUS_ONLINE)
return -EIO;

return video_usercopy(inode, file, cmd, arg, go7007_do_ioctl);
return video_usercopy(file, cmd, arg, go7007_do_ioctl);
}

static ssize_t go7007_read(struct file *file, char __user *data,
Expand Down

0 comments on commit 4f7ddec

Please sign in to comment.