Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/usb/misc/vstusb.c b/drivers/usb/misc/vstusb.c
index 8648470c81ca..63dff9ba73c5 100644
--- a/drivers/usb/misc/vstusb.c
+++ b/drivers/usb/misc/vstusb.c
@@ -620,7 +620,7 @@ static long vstusb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 __func__);
                         retval = -EFAULT;
                 } else {
-                        dev_dbg(&dev->dev, "%s: recv %d bytes from pipe %d\n",
+                        dev_dbg(&dev->dev, "%s: recv %zd bytes from pipe %d\n",
                                 __func__, usb_data.count, usb_data.pipe);
                 }