diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 21:49:12 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 21:49:12 +0300 |
| commit | 52e8e19b019ca7ad6951d7a39b78d24b198238bc (patch) | |
| tree | 5bc9dd4f4df1630aea1e0d7b42ba1673cdf810c7 /drivers/usb/class/usbtmc.c | |
| parent | 908c3d8c005f19f807c67105cede0bd2c352a8e6 (diff) | |
| parent | 61fbeba11c553c489ba5284c0ed67067dc7b7c0f (diff) | |
| download | linux-52e8e19b019ca7ad6951d7a39b78d24b198238bc.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: prevent autosuspend during hub initialization
USB: Unusual dev for the "Kyocera / Contax SL300R T*" digital camera.
USB: usbtmc: Use explicit unsigned type for input buffer instead of char*
USB: fix crash when URBs are unlinked after the device is gone
Diffstat (limited to 'drivers/usb/class/usbtmc.c')
| -rw-r--r-- | drivers/usb/class/usbtmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 543811f6e6e8..8e74657f106c 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -133,7 +133,7 @@ static int usbtmc_release(struct inode *inode, struct file *file) static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data) { - char *buffer; + u8 *buffer; struct device *dev; int rv; int n; |