diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 15:26:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 15:26:46 -0700 |
commit | d79df0b1eda0099a22cbcece01ce5e7d222450de (patch) | |
tree | eb9c938fa5faf285fb091d7446508a32229ceea4 /drivers/staging/line6/driver.c | |
parent | 6e80e8ed5eb92d0112674aabe82951266a6a1051 (diff) | |
parent | c8d1a126924fcbc1d61ceb830226e0c7afdcc841 (diff) | |
download | op-kernel-dev-d79df0b1eda0099a22cbcece01ce5e7d222450de.zip op-kernel-dev-d79df0b1eda0099a22cbcece01ce5e7d222450de.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (577 commits)
Staging: ramzswap: Handler for swap slot free callback
swap: Add swap slot free callback to block_device_operations
swap: Add flag to identify block swap devices
Staging: vt6655: use ETH_FRAME_LEN macro instead of custom one
Staging: vt6655: use ETH_DATA_LEN macro instead of custom one
Staging: vt6655: use ETH_FCS_LEN macro instead of custom one
Staging: vt6656: use ETH_HLEN macro instead of custom one
Staging: comedi: quatech_daqp_cs.c Replace eos semaphore with a completion.
Staging: dt3155v4l: remove private memory allocator
Staging: crystalhd: Remove typedefs from driver
Staging: winbond: Fix for pointer name format issue in mds.c
Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs
Staging: vt6656: removed custom CHAR/SHORT/INT/LONG typedefs
Staging: comedi: Altered the way printk is used in 8255.c
staging: iio: adis16350 and similar IMU driver
Staging: iio: max1363 Fix two bugs in single_channel_from_ring
Staging: iio: adis16220 extract bin_attribute structures from state
Staging: iio: adis16220 vibration sensor driver
Staging: comedi: Kconfig dependancy fixes
Staging: comedi: fix up build error from last Kconfig changes
...
Diffstat (limited to 'drivers/staging/line6/driver.c')
-rw-r--r-- | drivers/staging/line6/driver.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c index 2585554..1d5a473 100644 --- a/drivers/staging/line6/driver.c +++ b/drivers/staging/line6/driver.c @@ -399,7 +399,7 @@ static void line6_data_received(struct urb *urb) static int line6_send(struct usb_line6 *line6, unsigned char *buf, size_t len) { int retval; - unsigned int partial; + int partial; #if DO_DUMP_URB_SEND line6_write_hexdump(line6, 'S', buf, len); @@ -684,11 +684,11 @@ static int line6_probe(struct usb_interface *interface, const struct usb_device_ /* check vendor and product id */ for (devtype = ARRAY_SIZE(line6_id_table) - 1; devtype--;) { - u16 vendor = le16_to_cpu(usbdev->descriptor.idVendor); - u16 product = le16_to_cpu(usbdev->descriptor.idProduct); + u16 idVendor = le16_to_cpu(usbdev->descriptor.idVendor); + u16 idProduct = le16_to_cpu(usbdev->descriptor.idProduct); - if (vendor == line6_id_table[devtype].idVendor - && product == line6_id_table[devtype].idProduct) + if (idVendor == line6_id_table[devtype].idVendor + && idProduct == line6_id_table[devtype].idProduct) break; } |