[media] tm6000: fix uninitialized field, change prink to dprintk
authorStefan Ringel <stefan.ringel@arcor.de>
Sat, 21 May 2011 06:05:38 +0000 (03:05 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 21 May 2011 10:24:19 +0000 (07:24 -0300)
fix uninitialized field, change prink to dprintk

Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/tm6000/tm6000-usb-isoc.h
drivers/staging/tm6000/tm6000-video.c

index a9e61d95a9b22754ded6533f8dca1cafed100917..084c2a8904a3da6a3bcadb7ac67d07f0cf5e4fc3 100644 (file)
@@ -39,7 +39,7 @@ struct usb_isoc_ctl {
        int                             pos, size, pktsize;
 
                /* Last field: ODD or EVEN? */
-       int                             vfield;
+       int                             vfield, field;
 
                /* Stores incomplete commands */
        u32                             tmp_buf;
index 48023965656ce60c725c4dcff18db629e2f0e269..4264064a727e4001e837b77a0a1ae3752b3f6f4b 100644 (file)
@@ -334,6 +334,7 @@ static int copy_streams(u8 *data, unsigned long len,
                        size = dev->isoc_ctl.size;
                        pos = dev->isoc_ctl.pos;
                        pktsize = dev->isoc_ctl.pktsize;
+                       field = dev->isoc_ctl.field;
                }
                cpysize = (endp - ptr > size) ? size : endp - ptr;
                if (cpysize) {
@@ -359,7 +360,8 @@ static int copy_streams(u8 *data, unsigned long len,
                                /* Need some code to copy pts */
                                u32 pts;
                                pts = *(u32 *)ptr;
-                               printk(KERN_INFO "%s: field %d, PTS %x", dev->name, field, pts);
+                               dprintk(dev, V4L2_DEBUG_ISOC, "field %d, PTS %x",
+                                       field, pts);
                                break;
                        }
                        }
@@ -371,6 +373,7 @@ static int copy_streams(u8 *data, unsigned long len,
                        dev->isoc_ctl.pos = pos + cpysize;
                        dev->isoc_ctl.size = size - cpysize;
                        dev->isoc_ctl.cmd = cmd;
+                       dev->isoc_ctl.field = field;
                        dev->isoc_ctl.pktsize = pktsize - (endp - ptr);
                        ptr += endp - ptr;
                } else {