[media] tm6000: fix vbuf may be used uninitialized
authorJarod Wilson <jarod@redhat.com>
Mon, 11 Apr 2011 21:49:24 +0000 (18:49 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 20 May 2011 12:27:42 +0000 (09:27 -0300)
commitcc73b4b57c59141bb8a99f86a1af95f296262558
treef555857795f0bccb967d974a1738dd7feef294a3
parent990528ebe7b7f07f67e29e66700297b10557a706
[media] tm6000: fix vbuf may be used uninitialized

In commit 8aff8ba95155df, most of the manipulations to vbuf inside
copy_streams were gated on if !dev->radio, but one place that touches
vbuf lays outside those gates -- a memcpy of vbuf isn't NULL. If we
initialize vbuf to NULL, that memcpy will never happen in the case where
we do have dev->radio, and otherwise, in the !dev->radio case, the code
behaves exactly like it did prior to 8aff8ba95155df.

While we're at it, also fix an incorrectly indented closing brace for
one of the sections touching vbuf that is conditional on !dev->radio.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/tm6000/tm6000-video.c