V4L/DVB: tm6000: Fix copybuf continue logic
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 7 Jun 2010 15:10:14 +0000 (12:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 2 Aug 2010 17:06:00 +0000 (14:06 -0300)
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/tm6000/tm6000-video.c

index 6bf2b1387bd006a2f52d56e6708c7312037e6717..9a0b5a78c9579eeb73af55b7247ac941619277cf 100644 (file)
@@ -285,7 +285,7 @@ static int copy_streams(u8 *data, unsigned long len,
                                break;
                        case TM6000_URB_MSG_AUDIO:
                        case TM6000_URB_MSG_PTS:
-                               cpysize = pktsize;      /* Size is always 180 bytes */
+                               size = pktsize;         /* Size is always 180 bytes */
                                break;
                        }
                } else {
@@ -315,7 +315,7 @@ static int copy_streams(u8 *data, unsigned long len,
                                break;
                        }
                }
-               if (ptr + pktsize > endp) {
+               if (cpysize < size) {
                        /* End of URB packet, but cmd processing is not
                         * complete. Preserve the state for a next packet
                         */
@@ -323,7 +323,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 += endp - ptr;
+                       ptr += cpysize;
                } else {
                        dev->isoc_ctl.cmd = 0;
                        ptr += pktsize;