Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 423c79e3 authored by Stefan Ringel's avatar Stefan Ringel Committed by Mauro Carvalho Chehab
Browse files

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



fix uninitialized field, change prink to dprintk

Signed-off-by: default avatarStefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2a7b6a40

drivers/staging/tm6000/tm6000-usb-isoc.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/tm6000/tm6000-video.c

+4 −1
Original line number Diff line number Diff line
@@ -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 {