diff options
| author |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-06-30 17:24:28 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 14:06:02 -0300 |
| commit | ccfb30288228aaaf40a849bffe434bc9eb46b23c (patch) | |
| tree | 67662f13ac99c56eb7dbf942341d8f35458ee6e7 /drivers/staging/tm6000 | |
| parent | V4L/DVB: tm6000: Be sure that the new buffer is empty (diff) | |
| download | linux-dev-ccfb30288228aaaf40a849bffe434bc9eb46b23c.tar.xz linux-dev-ccfb30288228aaaf40a849bffe434bc9eb46b23c.zip | |
V4L/DVB: tm6000: Partially revert some copybuf logic
Partially revert changeset 0208bef609242a2d50b95edc713a41566cae500b:
As pointed by Stefan Ringel <stefan.ringel@arcor.de>, many packets become
damaged by this change. That means that the "size" field of Video/VBI is not
presenting 180 bytes, as it should be expected.
Thanks-to: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/tm6000')
| -rw-r--r-- | drivers/staging/tm6000/tm6000-video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c index fd36b36407c5..ce0a089a0771 100644 --- a/drivers/staging/tm6000/tm6000-video.c +++ b/drivers/staging/tm6000/tm6000-video.c @@ -314,7 +314,7 @@ static int copy_streams(u8 *data, unsigned long len, break; } } - if (cpysize < size) { + if (ptr + pktsize > endp) { /* End of URB packet, but cmd processing is not * complete. Preserve the state for a next packet */ @@ -322,7 +322,7 @@ static int copy_streams(u8 *data, unsigned long len, dev->isoc_ctl.size = size - cpysize; dev->isoc_ctl.cmd = cmd; dev->isoc_ctl.pktsize = pktsize - (endp - ptr); - ptr += cpysize; + ptr += endp - ptr; } else { dev->isoc_ctl.cmd = 0; ptr += pktsize; |