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>

diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index fd36b36407c5747947edaa6d595bda28fc9837a9..ce0a089a07717a5ee5ce24ddeecd0c0789e4a8da 100644 (file)
--- 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;