aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@kernellabs.com>2009-07-19 17:19:18 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-07-24 13:03:32 -0400
commit12a34cc8a9a49219ab643c8ec329078eec272b47 (patch)
tree94396062e8636301e5a718876d1b534d3c44bf1f /drivers/media
parent2c90577841a76f1935ff3437ffb552b41f5c28fa (diff)
V4L/DVB (12302): cx23885-417: fix broken IOCTL handling
IOCTLS will never get handled if we dont connect video_ioctl2 to mpeg_fops.ioctl Signed-off-by: Michael Krufky <mkrufky@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx23885/cx23885-417.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 428f0c45e6b7..2ea7181ae8fb 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -1677,6 +1677,7 @@ static struct v4l2_file_operations mpeg_fops = {
1677 .read = mpeg_read, 1677 .read = mpeg_read,
1678 .poll = mpeg_poll, 1678 .poll = mpeg_poll,
1679 .mmap = mpeg_mmap, 1679 .mmap = mpeg_mmap,
1680 .ioctl = video_ioctl2,
1680}; 1681};
1681 1682
1682static const struct v4l2_ioctl_ops mpeg_ioctl_ops = { 1683static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {