diff options
| author | Stefan Ringel <stefan.ringel@arcor.de> | 2011-05-21 03:05:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-21 07:24:19 -0300 |
| commit | 423c79e3fed751c244aceb39031920669e1d039a (patch) | |
| tree | ce27f7d7619580ed83d2919a9554937131dc448c | |
| parent | 2a7b6a404b4c6a9184b60b89607d5f883c43fa62 (diff) | |
| download | lwn-423c79e3fed751c244aceb39031920669e1d039a.tar.gz lwn-423c79e3fed751c244aceb39031920669e1d039a.zip | |
[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.h | 2 | ||||
| -rw-r--r-- | drivers/staging/tm6000/tm6000-video.c | 5 |
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 { int pos, size, pktsize; /* Last field: ODD or EVEN? */ - int vfield; + int vfield, field; /* Stores incomplete commands */ 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, 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 { |