diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 16:15:43 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 16:15:43 -0200 |
commit | f908968983a448cba404613e0564a7097b63558f (patch) | |
tree | 31f33203850a0c4fcde070ee5e0795880ca7c8fd /linux/drivers/media/video/pwc/pwc-if.c | |
parent | 94703235501e112e7496efe5bce32671e121d98f (diff) | |
parent | 0cb9746f402b6eb2d3220ae59b522cddf4db9bcd (diff) | |
download | mediapointer-dvb-s2-f908968983a448cba404613e0564a7097b63558f.tar.gz mediapointer-dvb-s2-f908968983a448cba404613e0564a7097b63558f.tar.bz2 |
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc-if.c')
-rw-r--r-- | linux/drivers/media/video/pwc/pwc-if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-if.c b/linux/drivers/media/video/pwc/pwc-if.c index 041bb96f7..d657e6f8d 100644 --- a/linux/drivers/media/video/pwc/pwc-if.c +++ b/linux/drivers/media/video/pwc/pwc-if.c @@ -1416,7 +1416,7 @@ static int pwc_video_ioctl(struct inode *inode, struct file *file, mutex_lock(&pdev->modlock); if (!pdev->unplugged) - r = video_usercopy(inode, file, cmd, arg, pwc_video_do_ioctl); + r = video_usercopy(file, cmd, arg, pwc_video_do_ioctl); mutex_unlock(&pdev->modlock); out: return r; |