diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-04-10 14:42:07 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-04-10 14:42:07 +0000 |
| commit | 3d5f4f7383255c4c8612508e6cdf166c86db25c3 (patch) | |
| tree | d5579bda3492cc2610d3b7a4838d9b5efd3841b5 /usb.c | |
| parent | 82624de6ba2a009c9cf168c029e19b1f8280a88f (diff) | |
| download | ldetect-3d5f4f7383255c4c8612508e6cdf166c86db25c3.tar ldetect-3d5f4f7383255c4c8612508e6cdf166c86db25c3.tar.gz ldetect-3d5f4f7383255c4c8612508e6cdf166c86db25c3.tar.bz2 ldetect-3d5f4f7383255c4c8612508e6cdf166c86db25c3.tar.xz ldetect-3d5f4f7383255c4c8612508e6cdf166c86db25c3.zip | |
ignore usb interfaces not active
Diffstat (limited to 'usb.c')
| -rw-r--r-- | usb.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -60,7 +60,7 @@ extern struct pciusb_entries usb_probe(void) { 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) { + if (sscanf(buf, "I:* 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; @@ -80,6 +80,8 @@ 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: If#=%*2d Alt=%*2d #EPs=%*2d Cls=%02x(%*5c) Sub=%02x Prot=%02x Driver=%s", &class_id, &sub, &prot, driver) == 4) { + /* Ignore interfaces not active */ } else fprintf(stderr, "%s %d: unknown ``I'' line\n", proc_usb_path, line); break; } |