aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx18/cx18-fileops.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2015-03-09 13:34:03 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-03 00:05:36 -0300
commit08569d6477d76e2fc8fdd41cfb0ce02f59333c69 (patch)
treeec115d8b99b8f2b3cf632cd8b74b29acc204fed3 /drivers/media/pci/cx18/cx18-fileops.c
parent[media] ivtv: disable fbuf support if ivtvfb isn't loaded (diff)
downloadlinux-dev-08569d6477d76e2fc8fdd41cfb0ce02f59333c69.tar.xz
linux-dev-08569d6477d76e2fc8fdd41cfb0ce02f59333c69.zip
[media] cx18: embed video_device
Embed the video_device struct to simplify the error handling and in order to (eventually) get rid of video_device_alloc/release. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/cx18/cx18-fileops.c')
-rw-r--r--drivers/media/pci/cx18/cx18-fileops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx18/cx18-fileops.c b/drivers/media/pci/cx18/cx18-fileops.c
index 76a3b4ac541e..d245445eea2d 100644
--- a/drivers/media/pci/cx18/cx18-fileops.c
+++ b/drivers/media/pci/cx18/cx18-fileops.c
@@ -797,7 +797,7 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp)
CX18_DEBUG_WARN("nomem on v4l2 open\n");
return -ENOMEM;
}
- v4l2_fh_init(&item->fh, s->video_dev);
+ v4l2_fh_init(&item->fh, &s->video_dev);
item->cx = cx;
item->type = s->type;