diff --git a/[refs] b/[refs] index 064ae6021c00..5782d21cd724 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0669c872ff68cac5ab312569e716c12171440a9 +refs/heads/master: 758bb0b3e77d7876b76e48b4ac20f473be004421 diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c index 9a0b5a78c957..fd36b36407c5 100644 --- a/trunk/drivers/staging/tm6000/tm6000-video.c +++ b/trunk/drivers/staging/tm6000/tm6000-video.c @@ -150,8 +150,6 @@ static inline void get_next_buf(struct tm6000_dmaqueue *dma_q, /* Cleans up buffer - Usefull for testing for frame/URB loss */ outp = videobuf_to_vmalloc(&(*buf)->vb); -// if (outp) -// memset(outp, 0, (*buf)->vb.size); return; } @@ -272,6 +270,7 @@ static int copy_streams(u8 *data, unsigned long len, voutp = videobuf_to_vmalloc (&vbuf->vb); if (!voutp) return rc; + memset(voutp, 0, vbuf->vb.size); } linewidth = vbuf->vb.width << 1; pos = ((line << 1) - field - 1) * linewidth +