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

Commit 5330e927 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] size_t portability fixes - drivers/usb 



size_t is zu, ssize_t is zd...

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 97af1128

drivers/usb/media/pwc/pwc-if.c

+2 −2
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev) 
	  case 730:

	  case 740:

	  case 750:

	    Trace(TRACE_MEMORY,"private_data(%Zd)\n",sizeof(struct pwc_dec23_private));

	    Trace(TRACE_MEMORY,"private_data(%zu)\n",sizeof(struct pwc_dec23_private));

	    kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);	/* Timon & Kiara */

	    break;

	  case 645:
@@ -1179,7 +1179,7 @@ static ssize_t pwc_video_read(struct file *file, char __user * buf, 
	DECLARE_WAITQUEUE(wait, current);

        int bytes_to_read;



	Trace(TRACE_READ, "video_read(0x%p, %p, %Zd) called.\n", vdev, buf, count);

	Trace(TRACE_READ, "video_read(0x%p, %p, %zu) called.\n", vdev, buf, count);

	if (vdev == NULL)

		return -EFAULT;

	pdev = vdev->priv;

drivers/usb/misc/sisusbvga/sisusb.c

+1 −1
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ static int sisusb_write_mem_bulk(struct sisusb_usb_data *sisusb, u32 addr, 
				msgcount++;

				if (msgcount < 500)

					printk(KERN_ERR

						"sisusbvga[%d]: Wrote %Zd of "

						"sisusbvga[%d]: Wrote %zd of "

						"%d bytes, error %d\n",

						sisusb->minor, *bytes_written,

						length, ret);

drivers/usb/net/usbnet.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static void skb_return (struct usbnet *dev, struct sk_buff *skb) 
	dev->stats.rx_bytes += skb->len;



	if (netif_msg_rx_status (dev))

		devdbg (dev, "< rx, len %zd, type 0x%x",

		devdbg (dev, "< rx, len %zu, type 0x%x",

			skb->len + sizeof (struct ethhdr), skb->protocol);

	memset (skb->cb, 0, sizeof (struct skb_data));

	status = netif_rx (skb);