diff options
author | Andy Walls <awalls@radix.net> | 2008-11-05 19:19:15 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:38:01 -0500 |
commit | f68d0cf56761128e85ebc98d8de4776b89c30279 (patch) | |
tree | 3c0af57cc1909728bef2397b2e9a58305fdea301 /drivers/media/video/cx18/cx18-streams.c | |
parent | 13563f44a27a07dfade36662903037edbf8a6e01 (diff) |
V4L/DVB (9592): cx18: Use default kernel work queue; fix streaming flag for work handler
cx18: Use default kernel work queue; fix streaming flag for work handler.
Eliminate cx18 specific work queue and use the kernel default work queue.
Fixed the F_STREAMING_FLAG for the TS stream so cx18_dvb_work_handler()
can know when it is not safe to send MDLs to the firmware.
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-streams.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-streams.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c index e5ff7705b7a1..c7d431f49238 100644 --- a/drivers/media/video/cx18/cx18-streams.c +++ b/drivers/media/video/cx18/cx18-streams.c | |||
@@ -560,9 +560,6 @@ int cx18_stop_v4l2_encode_stream(struct cx18_stream *s, int gop_end) | |||
560 | CX18_INFO("ignoring gop_end: not (yet?) supported by the firmware\n"); | 560 | CX18_INFO("ignoring gop_end: not (yet?) supported by the firmware\n"); |
561 | } | 561 | } |
562 | 562 | ||
563 | /* Tell the CX23418 it can't use our buffers anymore */ | ||
564 | cx18_vapi(cx, CX18_CPU_DE_RELEASE_MDL, 1, s->handle); | ||
565 | |||
566 | if (s->type != CX18_ENC_STREAM_TYPE_TS) | 563 | if (s->type != CX18_ENC_STREAM_TYPE_TS) |
567 | atomic_dec(&cx->ana_capturing); | 564 | atomic_dec(&cx->ana_capturing); |
568 | atomic_dec(&cx->tot_capturing); | 565 | atomic_dec(&cx->tot_capturing); |
@@ -570,6 +567,9 @@ int cx18_stop_v4l2_encode_stream(struct cx18_stream *s, int gop_end) | |||
570 | /* Clear capture and no-read bits */ | 567 | /* Clear capture and no-read bits */ |
571 | clear_bit(CX18_F_S_STREAMING, &s->s_flags); | 568 | clear_bit(CX18_F_S_STREAMING, &s->s_flags); |
572 | 569 | ||
570 | /* Tell the CX23418 it can't use our buffers anymore */ | ||
571 | cx18_vapi(cx, CX18_CPU_DE_RELEASE_MDL, 1, s->handle); | ||
572 | |||
573 | cx18_vapi(cx, CX18_DESTROY_TASK, 1, s->handle); | 573 | cx18_vapi(cx, CX18_DESTROY_TASK, 1, s->handle); |
574 | s->handle = CX18_INVALID_TASK_HANDLE; | 574 | s->handle = CX18_INVALID_TASK_HANDLE; |
575 | 575 | ||