Prev: linux-next: build failure after merge of the driver-core tree
Next: posix_timer: move copy_to_user(created_timer_id) down in timer_create
From: Hans Verkuil on 18 May 2010 02:50
On Monday 17 May 2010 08:50:51 Frederic Weisbecker wrote:
> These are the last remaining v4l drivers that implement the ioctl
> callback.
>
> Signed-off-by: Frederic Weisbecker <fweisbec(a)gmail.com>
> ---
> drivers/media/radio/radio-mr800.c | 5 +++-
> drivers/media/video/bw-qcam.c | 11 ++++++++-
> drivers/media/video/c-qcam.c | 11 ++++++++-
> drivers/media/video/cpia.c | 11 ++++++++-
> drivers/media/video/cpia2/cpia2_v4l.c | 11 ++++++++-
> drivers/media/video/cx18/cx18-ioctl.c | 4 +++
> drivers/media/video/cx18/cx18-streams.c | 12 +++++-----
> drivers/media/video/et61x251/et61x251_core.c | 27 +++++++++++++++++++------
> drivers/media/video/ov511.c | 15 ++++++++-----
> drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 20 ++++++++++++------
> drivers/media/video/pwc/pwc-if.c | 19 ++++++++++-------
> drivers/media/video/saa5246a.c | 11 ++++++---
> drivers/media/video/saa5249.c | 6 ++++-
> drivers/media/video/se401.c | 20 ++++++++++++------
> drivers/media/video/sn9c102/sn9c102_core.c | 27 +++++++++++++++++++------
> drivers/media/video/stradis.c | 26 ++++++++++++++++++------
> drivers/media/video/stv680.c | 20 ++++++++++++------
> drivers/media/video/usbvideo/usbvideo.c | 21 +++++++++++++------
> drivers/media/video/usbvideo/vicam.c | 14 ++++++++++++-
> drivers/media/video/uvc/uvc_v4l2.c | 11 ++++++++-
> drivers/media/video/vivi.c | 2 +-
> drivers/media/video/w9968cf.c | 25 ++++++++++++++++++-----
> drivers/media/video/zc0301/zc0301_core.c | 27 +++++++++++++++++++------
> drivers/staging/cx25821/cx25821-audups11.c | 18 ++++++++++------
> drivers/staging/cx25821/cx25821-videoioctl.c | 27 +++++++++++++++++++------
> drivers/staging/cx25821/cx25821-vidups10.c | 19 +++++++++++------
> drivers/staging/cx25821/cx25821-vidups9.c | 18 ++++++++++------
> drivers/staging/dream/camera/msm_v4l2.c | 27 ++++++++++++++++++-------
> 28 files changed, 329 insertions(+), 136 deletions(-)
>

<cut>

> diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
> index e17b6fe..b5e4855 100644
> --- a/drivers/media/video/vivi.c
> +++ b/drivers/media/video/vivi.c
> @@ -1086,7 +1086,7 @@ static const struct v4l2_file_operations vivi_fops = {
> .release = vivi_close,
> .read = vivi_read,
> .poll = vivi_poll,
> - .ioctl = video_ioctl2, /* V4L2 ioctl handler */
> + .unlocked_ioctl = video_ioctl2, /* V4L2 ioctl handler */
> .mmap = vivi_mmap,
> };

Huh? Shouldn't this be in patch 2/4 replacing video_ioctl2 with video_ioctl2_bkl?

> diff --git a/drivers/staging/dream/camera/msm_v4l2.c b/drivers/staging/dream/camera/msm_v4l2.c

Interesting. A new v4l2 driver in staging. That one seems to have bypassed
the linux-media list completely as I can't remember seeing this driver there.

It would be nice if linux-media was CC-ed on drivers like this...

Regards,

Hans

> index c276f2f..7744287 100644
> --- a/drivers/staging/dream/camera/msm_v4l2.c
> +++ b/drivers/staging/dream/camera/msm_v4l2.c
> @@ -12,6 +12,7 @@
> #include <linux/spinlock.h>
> #include <linux/videodev2.h>
> #include <linux/proc_fs.h>
> +#include <linux/smp_lock.h>
> #include <linux/slab.h>
> #include <media/v4l2-dev.h>
> #include <media/msm_camera.h>
> @@ -99,6 +100,7 @@ static unsigned int msm_v4l2_poll(struct file *f, struct poll_table_struct *w)
> static long msm_v4l2_ioctl(struct file *filep,
> unsigned int cmd, unsigned long arg)
> {
> + long ret;
> struct msm_ctrl_cmd *ctrlcmd;
>
> D("msm_v4l2_ioctl, cmd = %d, %d\n", cmd, __LINE__);
> @@ -119,18 +121,27 @@ static long msm_v4l2_ioctl(struct file *filep,
> D("msm_v4l2_ioctl, MSM_V4L2_START_SNAPSHOT v4l2 ioctl %d\n",
> cmd);
> ctrlcmd->type = MSM_V4L2_SNAPSHOT;
> - return g_pmsm_v4l2_dev->drv->ctrl(g_pmsm_v4l2_dev->drv->sync,
> + lock_kernel();
> + ret = g_pmsm_v4l2_dev->drv->ctrl(g_pmsm_v4l2_dev->drv->sync,
> ctrlcmd);
> + unlock_kernel();
> + return ret;
>
> case MSM_V4L2_GET_PICTURE:
> D("msm_v4l2_ioctl, MSM_V4L2_GET_PICTURE v4l2 ioctl %d\n", cmd);
> ctrlcmd = (struct msm_ctrl_cmd *)arg;
> - return g_pmsm_v4l2_dev->drv->get_pict(
> + lock_kernel();
> + ret = g_pmsm_v4l2_dev->drv->get_pict(
> g_pmsm_v4l2_dev->drv->sync, ctrlcmd);
> + unlock_kernel();
> + return ret;
>
> default:
> D("msm_v4l2_ioctl, standard v4l2 ioctl %d\n", cmd);
> - return video_ioctl2(filep, cmd, arg);
> + lock_kernel();
> + ret = video_ioctl2(filep, cmd, arg);
> + unlock_kernel();
> + return ret;
> }
> }
>
> @@ -640,11 +651,11 @@ int msm_v4l2_read_proc(char *pbuf, char **start, off_t offset,
> #endif
>
> static const struct v4l2_file_operations msm_v4l2_fops = {
> - .owner = THIS_MODULE,
> - .open = msm_v4l2_open,
> - .poll = msm_v4l2_poll,
> - .release = msm_v4l2_release,
> - .ioctl = msm_v4l2_ioctl,
> + .owner = THIS_MODULE,
> + .open = msm_v4l2_open,
> + .poll = msm_v4l2_poll,
> + .release = msm_v4l2_release,
> + .unlocked_ioctl = msm_v4l2_ioctl,
> };
>
> static void msm_v4l2_dev_init(struct msm_v4l2_device *pmsm_v4l2_dev)
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: linux-next: build failure after merge of the driver-core tree
Next: posix_timer: move copy_to_user(created_timer_id) down in timer_create