system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[media] tm6000: fix uninitialized field, change prink to dprintk

Browse source 
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>
This commit is contained in:
Stefan Ringel 2011-05-21 03:05:38 -03:00 committed by Mauro Carvalho Chehab
parent 2a7b6a404b
commit 423c79e3fe
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/tm6000/tm6000-usb-isoc.h
View 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;

5
drivers/staging/tm6000/tm6000-video.c
View 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 {