There are three drivers that use video_ioctl2() as an unlocked_ioctl, let them use the new video_ioctl2_unlocked. Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx> --- drivers/media/video/davinci/vpfe_capture.c | 2 +- drivers/media/video/gspca/gspca.c | 2 +- drivers/media/video/hdpvr/hdpvr-video.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index aa1411f..61a3514 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/video/davinci/vpfe_capture.c @@ -786,7 +786,7 @@ static const struct v4l2_file_operations vpfe_fops = { .owner = THIS_MODULE, .open = vpfe_open, .release = vpfe_release, - .unlocked_ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2_unlocked, .mmap = vpfe_mmap, .poll = vpfe_poll }; diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 68a8431..a424c1d 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -2184,7 +2184,7 @@ static struct v4l2_file_operations dev_fops = { .release = dev_close, .read = dev_read, .mmap = dev_mmap, - .unlocked_ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2_unlocked, .poll = dev_poll, }; diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c index 196f82d..01b8a34 100644 --- a/drivers/media/video/hdpvr/hdpvr-video.c +++ b/drivers/media/video/hdpvr/hdpvr-video.c @@ -559,7 +559,7 @@ static const struct v4l2_file_operations hdpvr_fops = { .release = hdpvr_release, .read = hdpvr_read, .poll = hdpvr_poll, - .unlocked_ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2_unlocked, }; /*=======================================================================*/ -- 1.6.2.3 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html