fix parsing of /proc/bus/usb/device I: lines and use the class

of the first interface used by a driver instead of the first
interface (or first one like before when none is used).

That fixes presenting something as usb_storage even if the
device is ignored by usb_storage driver and handled on another 
interface by option driver

2 files changed, 14 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 6bce09d..9123921 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+- fix parsing of /proc/bus/usb/device I: lines and use the class
+  of the first interface used by a driver instead of the first
+  interface (or first one like before when none is used).
+  That fixed presenting something as usb_storage even if the
+  device is ignored by usb_storage driver and handled on another 
+  interface by option driver
+
 Version 0.8.1 - 3 April 2009, Christophe Fergeau
 
 - enumerate hid bus
diff --git a/usb.c b/usb.c
index 10c512e..856fba3 100644
--- a/usb.c
+++ b/usb.c
@@ -57,13 +57,17 @@ extern struct pciusb_entries usb_probe(void) {
 			} else fprintf(stderr, "%s %d: unknown ``P'' line\n", proc_usb_path, line);
 			break;
 		}
-		case 'I': if (e->class_id == 0) {
+		case 'I': if (e->class_id == 0 || e->module == NULL) {
 			char driver[50];
 			int class_id, sub, prot = 0;
-			if (sscanf(buf, "I:%*1c  If#=%*2d Alt=%*2d #EPs=%*2d Cls=%02x(%*5c) Sub=%02x Prot=%02x Driver=%s", &class_id, &sub, &prot, driver) == 4) {
-				e->class_id = (class_id * 0x100 + sub) * 0x100 + prot;
+			if (sscanf(buf, "I:%*1c If#=%*2d Alt=%*2d #EPs=%*2d Cls=%02x(%*5c) Sub=%02x Prot=%02x Driver=%s", &class_id, &sub, &prot, driver) == 4) {
+				unsigned long cid = (class_id * 0x100 + sub) * 0x100 + prot;
+				if (e->class_id == 0)
+					e->class_id = cid;
 				if (strncmp(driver, "(none)", 6)) {
 					char *p;
+					/* Get current class if we are on the first one having used by a driver */
+					e->class_id = cid;
 					e->module = strdup(driver);
 					/* replace '-' characters with '_' to be compliant with modnames from modaliases */
 					p = e->module;
@@ -76,8 +80,6 @@ extern struct pciusb_entries usb_probe(void) {
 				if (e->class_id == (0x1*0x100+ 0x01)) /* USB_AUDIO_CLASS*0x100 + USB_SUBCLASS_AUDIO_CONTROL*/
 					e->module = strdup("snd_usb_audio");
 
-			} else if (sscanf(buf, "I:%*1c If#=%*2d Alt=%*2d #EPs=%*2d Cls=%02x(%*5c) Sub=%02x Prot=%02x Driver=", &class_id, &sub, &prot) == 3) {
-                    /* prevent spurious warnings for strange USB interfaces */
 			} else fprintf(stderr, "%s %d: unknown ``I'' line\n", proc_usb_path, line);
 			break;
 		}