diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-23 04:52:33 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-23 04:52:33 -0500 |
| commit | 9f1441644213e5f6faa150206399fe511eba2eb6 (patch) | |
| tree | e59d4e6475aa84f7e821a8c607deb56b85e19e95 /drivers/usb/misc/vstusb.c | |
| parent | 3ff68a6a106c362a6811d3e51bced58e6fc87de7 (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into irq/urgent
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 | ||