Hi,

Here's a patch against 2.4.10-ac10 that updates the acm driver to the
same version that is in the 2.4.11-pre6 tree.

thanks,

greg k-h


diff --minimal -Nru a/drivers/usb/acm.c b/drivers/usb/acm.c
--- a/drivers/usb/acm.c Tue Oct  9 15:09:43 2001
+++ b/drivers/usb/acm.c Tue Oct  9 15:09:43 2001
@@ -1,9 +1,9 @@
 /*
- * acm.c  Version 0.20
+ * acm.c  Version 0.21
  *
  * Copyright (c) 1999 Armin Fuerst     <[EMAIL PROTECTED]>
  * Copyright (c) 1999 Pavel Machek     <[EMAIL PROTECTED]>
- * Copyright (c) 1999 Johannes Erdfelt <[EMAIL PROTECTED]>
+ * Copyright (c) 1999 Johannes Erdfelt <[EMAIL PROTECTED]>
  * Copyright (c) 2000 Vojtech Pavlik   <[EMAIL PROTECTED]>
  *
  * USB Abstract Control Model driver for USB modems and ISDN adapters
@@ -22,7 +22,8 @@
  *     v0.17 - added new style probing
  *     v0.18 - fixed new style probing for devices with more configurations
  *     v0.19 - fixed CLOCAL handling (thanks to Richard Shih-Ping Chan)
- *      v0.20 - switched to probing on interface (rather than device) class
+ *     v0.20 - switched to probing on interface (rather than device) class
+ *     v0.21 - revert to probing on device for devices with multiple configs
  */
 
 /*
@@ -60,7 +61,7 @@
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v0.20"
+#define DRIVER_VERSION "v0.21"
 #define DRIVER_AUTHOR "Armin Fuerst, Pavel Machek, Johannes Erdfelt, Vojtech Pavlik"
 #define DRIVER_DESC "USB Abstract Control Model driver for USB modems and ISDN 
adapters"
 
@@ -648,8 +649,7 @@
  */
 
 static struct usb_device_id acm_ids[] = {
-       {match_flags: (USB_DEVICE_ID_MATCH_INT_CLASS | 
USB_DEVICE_ID_MATCH_INT_SUBCLASS),
-       bInterfaceClass: USB_CLASS_COMM, bInterfaceSubClass: 2},
+       { USB_DEVICE_INFO(USB_CLASS_COMM, 0, 0) },
        { }
 };
 


_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to