diff options
| author | Simon Farnsworth <simon.farnsworth@onelan.co.uk> | 2011-09-05 17:23:12 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-18 13:03:39 +0200 |
| commit | 09fc9802c31a9358a4e34642aa5f569111752879 (patch) | |
| tree | b07a8c6e035df000702b3f2bbfaeb8acd85418d6 /drivers/media/video/cx18/cx18-mailbox.c | |
| parent | [media] EM28xx - Fix memory leak on disconnect or error (diff) | |
| download | linux-09fc9802c31a9358a4e34642aa5f569111752879.tar.xz linux-09fc9802c31a9358a4e34642aa5f569111752879.zip | |
[media] cx18: Fix videobuf capture
When we moved to 3.0, we found that the cx18 driver was oopsing on close with:
NULL pointer deref at:
[ 2290.461009] Call Trace:
[ 2290.461009] [<c046007b>] ? pm_qos_add_request+0xc/0x6e
[ 2290.461009] [<c082631c>] __mutex_lock_common+0x87/0x125
[ 2290.461009] [<f8970e92>] ? cx18_queue_flush+0x31/0x87 [cx18]
[ 2290.461009] [<c0436b85>] ? __might_sleep+0x29/0xe4
[ 2290.461009] [<c0826515>] __mutex_lock_slowpath+0x25/0x27
[ 2290.461009] [<c08264b2>] ? mutex_lock+0x2e/0x3b
[ 2290.461009] [<c08264b2>] mutex_lock+0x2e/0x3b
[ 2290.461009] [<f88d3137>] videobuf_queue_lock+0x13/0x15 [videobuf_core]
[ 2290.461009] [<f88d3f86>] __videobuf_free+0xfc/0x112 [videobuf_core]
[ 2290.461009] [<f89741e6>] cx18_v4l2_close+0x158/0x172 [cx18]
[ 2290.461009] [<c0507522>] ? cpumask_next+0x1a/0x1d
[ 2290.461009] [<f88a319d>] v4l2_release+0x35/0x52 [videodev]
[ 2290.461009] [<c04f5717>] fput+0x100/0x1a5
[ 2290.461009] [<c04f2e09>] filp_close+0x5c/0x64
[ 2290.461009] [<c04f2e70>] sys_close+0x5f/0x93
[ 2290.461009] [<c082cd5f>] sysenter_do_call+0x12/0x28
Some digging showed that a merge at some previous point partially
added broken mmap() support, causing this trace. Remove the broken
code completely.
On top of that, the calculation in place for "buffer full" depended on
UYUV instead of HM12, while our GStreamer code was picking HM12 in
some circumstances.
Finally, the V4L2_CAP_STREAMING capability was never exposed. Patch it
into the YUV encoder node only.
Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-mailbox.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-mailbox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c index c07191e09fcb..0c7796e76ac0 100644 --- a/drivers/media/video/cx18/cx18-mailbox.c +++ b/drivers/media/video/cx18/cx18-mailbox.c @@ -196,7 +196,7 @@ static void cx18_mdl_send_to_videobuf(struct cx18_stream *s, } /* If we've filled the buffer as per the callers res then dispatch it */ - if (vb_buf->bytes_used >= (vb_buf->vb.width * vb_buf->vb.height * 2)) { + if (vb_buf->bytes_used >= s->vb_bytes_per_frame) { dispatch = 1; vb_buf->bytes_used = 0; } |