summaryrefslogtreecommitdiff
path: root/drivers/media/pci/cx18/cx18-streams.h
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-streams.h
parent38a1421ddd68edecb53e6dd16bae3a4b089fa1cf (diff)
[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-streams.h')
-rw-r--r--drivers/media/pci/cx18/cx18-streams.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx18/cx18-streams.h b/drivers/media/pci/cx18/cx18-streams.h
index 713b0e61536d..27f8af9b11cd 100644
--- a/drivers/media/pci/cx18/cx18-streams.h
+++ b/drivers/media/pci/cx18/cx18-streams.h
@@ -33,7 +33,7 @@ void cx18_stream_rotate_idx_mdls(struct cx18 *cx);
static inline bool cx18_stream_enabled(struct cx18_stream *s)
{
- return s->video_dev ||
+ return s->video_dev.v4l2_dev ||
(s->dvb && s->dvb->enabled) ||
(s->type == CX18_ENC_STREAM_TYPE_IDX &&
s->cx->stream_buffers[CX18_ENC_STREAM_TYPE_IDX] != 0);