2.6.6-rc1: cdc-acm still (differently) broken

[Colin Leroy <colin@colino.net>]

[-- Attachment #1: Type: text/plain, Size: 673 bytes --]

Hi,

cdc-acm was broken since after 2.6.4, due to the alt_cursetting changes. I sent a patch, which has been integrated (well, the same one has ;-)) not long ago.
I gave 2.6.6-rc1 a try, and found that cdc-acm is now broken is a new way:
when plugging the phone, acm_probe() fails on interface #0; I traced the problem to this: usb_interface_claimed() returns true - and in fact intf->dev.driver is already cdc-acm (despite the fact that this is the first call to acm_probe() !), for reasons beyond my comprehension.

But, even if the interface is claimed, the intfdata hasn't been set, which allows to do another check: the attached patch fixes this bug. 

HTH,
-- 
Colin

[-- Attachment #2: cdc-acm.patch --]
[-- Type: application/octet-stream, Size: 468 bytes --]

--- drivers/usb/class/cdc-acm.c.orig	2004-04-15 20:04:47.051145144 +0200
+++ drivers/usb/class/cdc-acm.c	2004-04-15 20:05:52.419207688 +0200
@@ -585,7 +585,8 @@
 
 		for (j = 0; j < cfacm->desc.bNumInterfaces - 1; j++) {
 		    
-			if (usb_interface_claimed(cfacm->interface[j]) ||
+			if ((usb_interface_claimed(cfacm->interface[j]) 
+				&& usb_get_intfdata(cfacm->interface[j]) != NULL ) ||
 			    usb_interface_claimed(cfacm->interface[j + 1]))
 				continue;