aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Ringel <stefan.ringel@arcor.de>2011-05-21 02:05:38 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-21 06:24:19 -0400
commit423c79e3fed751c244aceb39031920669e1d039a (patch)
treece27f7d7619580ed83d2919a9554937131dc448c
parent2a7b6a404b4c6a9184b60b89607d5f883c43fa62 (diff)
[media] tm6000: fix uninitialized field, change prink to dprintk
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>
-rw-r--r--drivers/staging/tm6000/tm6000-usb-isoc.h2
-rw-r--r--drivers/staging/tm6000/tm6000-video.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h b/drivers/staging/tm6000/tm6000-usb-isoc.h
index a9e61d95a9b2..084c2a8904a3 100644
--- a/drivers/staging/tm6000/tm6000-usb-isoc.h
+++ b/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -39,7 +39,7 @@ struct usb_isoc_ctl {
39 int pos, size, pktsize; 39 int pos, size, pktsize;
40 40
41 /* Last field: ODD or EVEN? */ 41 /* Last field: ODD or EVEN? */
42 int vfield; 42 int vfield, field;
43 43
44 /* Stores incomplete commands */ 44 /* Stores incomplete commands */
45 u32 tmp_buf; 45 u32 tmp_buf;
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index 48023965656c..4264064a727e 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -334,6 +334,7 @@ static int copy_streams(u8 *data, unsigned long len,
334 size = dev->isoc_ctl.size; 334 size = dev->isoc_ctl.size;
335 pos = dev->isoc_ctl.pos; 335 pos = dev->isoc_ctl.pos;
336 pktsize = dev->isoc_ctl.pktsize; 336 pktsize = dev->isoc_ctl.pktsize;
337 field = dev->isoc_ctl.field;
337 } 338 }
338 cpysize = (endp - ptr > size) ? size : endp - ptr; 339 cpysize = (endp - ptr > size) ? size : endp - ptr;
339 if (cpysize) { 340 if (cpysize) {
@@ -359,7 +360,8 @@ static int copy_streams(u8 *data, unsigned long len,
359 /* Need some code to copy pts */ 360 /* Need some code to copy pts */
360 u32 pts; 361 u32 pts;
361 pts = *(u32 *)ptr; 362 pts = *(u32 *)ptr;
362 printk(KERN_INFO "%s: field %d, PTS %x", dev->name, field, pts); 363 dprintk(dev, V4L2_DEBUG_ISOC, "field %d, PTS %x",
364 field, pts);
363 break; 365 break;
364 } 366 }
365 } 367 }
@@ -371,6 +373,7 @@ static int copy_streams(u8 *data, unsigned long len,
371 dev->isoc_ctl.pos = pos + cpysize; 373 dev->isoc_ctl.pos = pos + cpysize;
372 dev->isoc_ctl.size = size - cpysize; 374 dev->isoc_ctl.size = size - cpysize;
373 dev->isoc_ctl.cmd = cmd; 375 dev->isoc_ctl.cmd = cmd;
376 dev->isoc_ctl.field = field;
374 dev->isoc_ctl.pktsize = pktsize - (endp - ptr); 377 dev->isoc_ctl.pktsize = pktsize - (endp - ptr);
375 ptr += endp - ptr; 378 ptr += endp - ptr;
376 } else { 379 } else {