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 | |
| 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')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-if.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-v4l.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc.h | 3 |
3 files changed, 3 insertions, 5 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; diff --git a/linux/drivers/media/video/pwc/pwc-v4l.c b/linux/drivers/media/video/pwc/pwc-v4l.c index 76a1376c9..d7c147328 100644 --- a/linux/drivers/media/video/pwc/pwc-v4l.c +++ b/linux/drivers/media/video/pwc/pwc-v4l.c @@ -337,8 +337,7 @@ static int pwc_vidioc_set_fmt(struct pwc_device *pdev, struct v4l2_format *f) } -int pwc_video_do_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, void *arg) +int pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) { struct video_device *vdev = video_devdata(file); struct pwc_device *pdev; diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h index 926defb11..ade796037 100644 --- a/linux/drivers/media/video/pwc/pwc.h +++ b/linux/drivers/media/video/pwc/pwc.h @@ -341,8 +341,7 @@ extern int pwc_camera_power(struct pwc_device *pdev, int power); extern int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg); /** Functions in pwc-v4l.c */ -extern int pwc_video_do_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, void *arg); +extern int pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg); /** pwc-uncompress.c */ /* Expand frame to image, possibly including decompression. Uses read_frame and fill_image */ |