]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Staging: line6: driver: fix up sparse warnings
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 5 May 2010 05:45:08 +0000 (22:45 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 May 2010 18:36:11 +0000 (11:36 -0700)
minor stuff.

Cc: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/line6/driver.c

index 258555417bc7aeaa02a53f80222721d77a870e2d..1d5a4730276363877f3f6e26f8e9710fc8811dd7 100644 (file)
@@ -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;
        }