diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /drivers/usb/misc/vstusb.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'drivers/usb/misc/vstusb.c')
| -rw-r--r-- | drivers/usb/misc/vstusb.c | 2 |
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) | |||
| 620 | __func__); | 620 | __func__); |
| 621 | retval = -EFAULT; | 621 | retval = -EFAULT; |
| 622 | } else { | 622 | } else { |
| 623 | dev_dbg(&dev->dev, "%s: recv %d bytes from pipe %d\n", | 623 | dev_dbg(&dev->dev, "%s: recv %zd bytes from pipe %d\n", |
| 624 | __func__, usb_data.count, usb_data.pipe); | 624 | __func__, usb_data.count, usb_data.pipe); |
| 625 | } | 625 | } |
| 626 | 626 | ||