summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx18/cx18-driver.h
diff options
context:
space:
mode:
authorHans Verkuil2015-03-09 17:34:03 +0100
committerMauro Carvalho Chehab2015-04-03 05:05:36 +0200
commit08569d6477d76e2fc8fdd41cfb0ce02f59333c69 (patch)
treeec115d8b99b8f2b3cf632cd8b74b29acc204fed3 /drivers/media/pci/cx18/cx18-driver.h
parent[media] ivtv: disable fbuf support if ivtvfb isn't loaded (diff)
downloadkernel-qcow2-linux-08569d6477d76e2fc8fdd41cfb0ce02f59333c69.tar.gz
kernel-qcow2-linux-08569d6477d76e2fc8fdd41cfb0ce02f59333c69.tar.xz
kernel-qcow2-linux-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-driver.h')
-rw-r--r--drivers/media/pci/cx18/cx18-driver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx18/cx18-driver.h b/drivers/media/pci/cx18/cx18-driver.h
index ec40f2db4e39..b15beed2dc14 100644
--- a/drivers/media/pci/cx18/cx18-driver.h
+++ b/drivers/media/pci/cx18/cx18-driver.h
@@ -373,7 +373,7 @@ struct cx18_in_work_order {
struct cx18_stream {
/* These first five fields are always set, even if the stream
is not actually created. */
- struct video_device *video_dev; /* NULL when stream not created */
+ struct video_device video_dev; /* v4l2_dev is NULL when stream not created */
struct cx18_dvb *dvb; /* DVB / Digital Transport */
struct cx18 *cx; /* for ease of use */
const char *name; /* name of the stream */