Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 492
b: refs/heads/master
c: 5330e92
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Apr 26, 2005
1 parent dd9360e commit 79e3d5e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 97af11286d68e359f61579214ca7a7b4433fe458
refs/heads/master: 5330e9273e2b3e372b01bb1cb75be4364f02db78
4 changes: 2 additions & 2 deletions trunk/drivers/usb/media/pwc/pwc-if.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/misc/sisusbvga/sisusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/net/usbnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 79e3d5e

Please sign in to comment.