summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-05-04 22:45:08 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-11 11:36:11 -0700
commit1e18c0d5b41ff2b482f1b5178da4f69d3223261c (patch)
treee409d54c988c7b916da09692f7a77e686cac9a40 /drivers
parent74112d3f3a64afb98179169cf8af691ccc63434d (diff)
downloadlinux-3.10-1e18c0d5b41ff2b482f1b5178da4f69d3223261c.tar.gz
linux-3.10-1e18c0d5b41ff2b482f1b5178da4f69d3223261c.tar.bz2
linux-3.10-1e18c0d5b41ff2b482f1b5178da4f69d3223261c.zip
Staging: line6: driver: fix up sparse warnings
minor stuff. Cc: Markus Grabner <grabner@icg.tugraz.at> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/line6/driver.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index 258555417bc..1d5a4730276 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;
}