summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-05-12 10:44:03 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-05-28 15:58:49 -0400
commit0d5615d3479fd165a4aca7f2dc3c418ffed3eb20 (patch)
treefadfd7f187f24c49a4c15350c500febc4edb897d /drivers/media
parent8a7c5594c02022ca5fa7fb603e11b3e1feb76ed5 (diff)
downloadlinux-0d5615d3479fd165a4aca7f2dc3c418ffed3eb20.tar.gz
linux-0d5615d3479fd165a4aca7f2dc3c418ffed3eb20.tar.bz2
linux-0d5615d3479fd165a4aca7f2dc3c418ffed3eb20.zip
media: v4l2-ioctl: delete unused v4l2_disable_ioctl_locking
The last user of this 'feature' was the gspca driver. Now that that driver has been converted to vb2 we can delete this code. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/v4l2-core/v4l2-ioctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 212aac1d22c1..c23fbfe90a9e 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -2666,8 +2666,6 @@ struct mutex *v4l2_ioctl_get_lock(struct video_device *vdev, unsigned cmd)
{
if (_IOC_NR(cmd) >= V4L2_IOCTLS)
return vdev->lock;
- if (test_bit(_IOC_NR(cmd), vdev->disable_locking))
- return NULL;
if (vdev->queue && vdev->queue->lock &&
(v4l2_ioctls[_IOC_NR(cmd)].flags & INFO_FL_QUEUE))
return vdev->queue->lock;