diff options
| author | Andy Walls <awalls@md.metrocast.net> | 2010-12-11 20:38:20 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 08:17:10 -0200 |
| commit | 754f9969c323559a12bce1475f3c1e6574129856 (patch) | |
| tree | 3345067e0920d27112b1449152d83e291fd348b3 /drivers/media/video/cx18/cx18-streams.h | |
| parent | fa98447f09641adeeaf02b94133649f03b74d159 (diff) | |
| download | op-kernel-dev-754f9969c323559a12bce1475f3c1e6574129856.zip op-kernel-dev-754f9969c323559a12bce1475f3c1e6574129856.tar.gz | |
[media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream
The cx18_stream struct contained a struct cx18_dvb for
every stream object, most of which were for analog capture.
Now we only allocate the cx18_dvb object for the DTV TS stream.
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-streams.h')
| -rw-r--r-- | drivers/media/video/cx18/cx18-streams.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-streams.h b/drivers/media/video/cx18/cx18-streams.h index 77412be..51765eb 100644 --- a/drivers/media/video/cx18/cx18-streams.h +++ b/drivers/media/video/cx18/cx18-streams.h @@ -33,7 +33,8 @@ void cx18_stream_rotate_idx_mdls(struct cx18 *cx); static inline bool cx18_stream_enabled(struct cx18_stream *s) { - return s->video_dev || s->dvb.enabled || + return s->video_dev || + (s->dvb && s->dvb->enabled) || (s->type == CX18_ENC_STREAM_TYPE_IDX && s->cx->stream_buffers[CX18_ENC_STREAM_TYPE_IDX] != 0); } |
