git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
line6
/
driver.c
diff --git
a/drivers/staging/line6/driver.c
b/drivers/staging/line6/driver.c
index 258555417bc7aeaa02a53f80222721d77a870e2d..1d5a4730276363877f3f6e26f8e9710fc8811dd7 100644
(file)
--- 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;
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);
#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--;) {
/* check vendor and product id */
for (devtype = ARRAY_SIZE(line6_id_table) - 1; devtype--;) {
- u16
v
endor = le16_to_cpu(usbdev->descriptor.idVendor);
- u16
p
roduct = le16_to_cpu(usbdev->descriptor.idProduct);
+ u16
idV
endor = le16_to_cpu(usbdev->descriptor.idVendor);
+ u16
idP
roduct = le16_to_cpu(usbdev->descriptor.idProduct);
- if (
v
endor == line6_id_table[devtype].idVendor
- &&
p
roduct == line6_id_table[devtype].idProduct)
+ if (
idV
endor == line6_id_table[devtype].idVendor
+ &&
idP
roduct == line6_id_table[devtype].idProduct)
break;
}
break;
}