diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-11-07 08:46:07 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-11-07 08:46:07 +0100 |
| commit | 8bf5ff37ec43c9afcf8a352754624f6462c06a02 (patch) | |
| tree | c407189bc8a36c3b5d452a13692037949858e7f2 /linux/drivers/media/video/cpia.c | |
| parent | 4c6dca7b19e1055dd0d4aaa8123c9a832f117202 (diff) | |
| parent | 17490135b2a7a46fc7fb67d64dbaeb1301ea169d (diff) | |
| download | mediapointer-dvb-s2-8bf5ff37ec43c9afcf8a352754624f6462c06a02.tar.gz mediapointer-dvb-s2-8bf5ff37ec43c9afcf8a352754624f6462c06a02.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/cpia.c')
| -rw-r--r-- | linux/drivers/media/video/cpia.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cpia.c b/linux/drivers/media/video/cpia.c index 5873614eb..004f36928 100644 --- a/linux/drivers/media/video/cpia.c +++ b/linux/drivers/media/video/cpia.c @@ -3334,8 +3334,7 @@ static ssize_t cpia_read(struct file *file, char __user *buf, return cam->decompressed_frame.count; } -static int cpia_do_ioctl(struct inode *inode, struct file *file, - unsigned int ioctlnr, void *arg) +static int cpia_do_ioctl(struct file *file, unsigned int cmd, void *arg) { struct video_device *dev = file->private_data; struct cam_data *cam = video_get_drvdata(dev); @@ -3348,9 +3347,9 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file, if (mutex_lock_interruptible(&cam->busy_lock)) return -EINTR; - //DBG("cpia_ioctl: %u\n", ioctlnr); + /* DBG("cpia_ioctl: %u\n", cmd); */ - switch (ioctlnr) { + switch (cmd) { /* query capabilities */ case VIDIOCGCAP: { @@ -3725,7 +3724,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file, static int cpia_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - return video_usercopy(inode, file, cmd, arg, cpia_do_ioctl); + return video_usercopy(file, cmd, arg, cpia_do_ioctl); } |