diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-05 10:21:08 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:51:37 -0800 |
| commit | 4f7ddec22312926909c03b220c74b0efad4affe8 (patch) | |
| tree | 989a723591b1fdbc6ea076788d68cc01ee4427d7 | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
| download | kernel_samsung_smdk4412-4f7ddec22312926909c03b220c74b0efad4affe8.zip kernel_samsung_smdk4412-4f7ddec22312926909c03b220c74b0efad4affe8.tar.gz kernel_samsung_smdk4412-4f7ddec22312926909c03b220c74b0efad4affe8.tar.bz2 | |
Staging: go7007: fixes due to video_usercopy api change
video_usercopy() just changed its arguments, so fix up the go7007 driver
to properly build.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/go7007/go7007-v4l2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c index 94e1141..b925761 100644 --- a/drivers/staging/go7007/go7007-v4l2.c +++ b/drivers/staging/go7007/go7007-v4l2.c @@ -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; @@ -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, |