PATCH: fix invalid/illegal oddments in USB

From: Alan Cox (alan@lxorguk.ukuu.org.uk)
Date: Sun Jul 27 2003 - 15:15:10 EST


diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/drivers/usb/misc/usbtest.c linux-2.6.0-test2-ac1/drivers/usb/misc/usbtest.c
--- linux-2.6.0-test2/drivers/usb/misc/usbtest.c 2003-07-27 19:56:28.000000000 +0100
+++ linux-2.6.0-test2-ac1/drivers/usb/misc/usbtest.c 2003-07-27 20:30:56.000000000 +0100
@@ -471,7 +471,7 @@
                  * they're ordered meaningfully in this array
                  */
                 if (iface->altsetting [i].desc.bAlternateSetting != i) {
- dbg ("%s, illegal alt [%d].bAltSetting = %d",
+ dbg ("%s, invalid alt [%d].bAltSetting = %d",
                                         dev->id, i,
                                         iface->altsetting [i].desc
                                                 .bAlternateSetting);
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/drivers/usb/net/usbnet.c linux-2.6.0-test2-ac1/drivers/usb/net/usbnet.c
--- linux-2.6.0-test2/drivers/usb/net/usbnet.c 2003-07-27 19:56:28.000000000 +0100
+++ linux-2.6.0-test2-ac1/drivers/usb/net/usbnet.c 2003-07-23 16:46:49.000000000 +0100
@@ -890,7 +890,7 @@
         le32_to_cpus (&header->packet_count);
         if ((header->packet_count > GL_MAX_TRANSMIT_PACKETS)
                         || (header->packet_count < 0)) {
- dbg ("genelink: illegal received packet count %d",
+ dbg ("genelink: invalid received packet count %d",
                         header->packet_count);
                 return 0;
         }
@@ -907,7 +907,7 @@
 
                 // this may be a broken packet
                 if (size > GL_MAX_PACKET_LEN) {
- dbg ("genelink: illegal rx length %d", size);
+ dbg ("genelink: invalid rx length %d", size);
                         return 0;
                 }
 
@@ -943,7 +943,7 @@
         skb_pull (skb, 4);
 
         if (skb->len > GL_MAX_PACKET_LEN) {
- dbg ("genelink: illegal rx length %d", skb->len);
+ dbg ("genelink: invalid rx length %d", skb->len);
                 return 0;
         }
         return 1;
@@ -2769,6 +2769,15 @@
         .bInterfaceSubClass = 0x0a,
         .bInterfaceProtocol = 0x00,
         .driver_info = (unsigned long) &zaurus_slc700_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x04DD,
+ .idProduct = 0x9031,
+ .bInterfaceClass = 0x02,
+ .bInterfaceSubClass = 0x0a,
+ .bInterfaceProtocol = 0x00,
+ .driver_info = (unsigned long) &zaurus_sla300_info,
 },
 #endif
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Jul 31 2003 - 22:00:33 EST