From: Frank Schaefer Date: Fri, 25 Jul 2014 18:08:30 +0000 (-0300) Subject: [media] em28xx-v4l: fix disabling ioctl VIDIOC_S_PARM for vbi devices X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3d3a41098e4b9580e7570026ab361cb5b0c7f037;p=deliverable%2Flinux.git [media] em28xx-v4l: fix disabling ioctl VIDIOC_S_PARM for vbi devices Fixes an old copy+paste bug that has survived all recent code changes in this code area. Signed-off-by: Frank Schäfer Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 087ccf98d0d4..90dec2955f1c 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -2528,7 +2528,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) v4l2->vbi_dev->queue->lock = &v4l2->vb_vbi_queue_lock; /* disable inapplicable ioctls */ - v4l2_disable_ioctl(v4l2->vdev, VIDIOC_S_PARM); + v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_S_PARM); if (dev->tuner_type == TUNER_ABSENT) { v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_G_TUNER); v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_S_TUNER);