From 9a7ee165fe13fe087d877c49ddcdbb45ca366409 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Sun, 13 Apr 2008 14:00:44 -0700 Subject: [PATCH] --- yaml --- r: 93368 b: refs/heads/master c: c6dbf554bc8a79c9caab3dbf891a33c19068f646 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/cdc-acm.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1b59ba4e5a79..c064e0e71f1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08177e12b7b4c3d59060f829e5c151d06f9a08d6 +refs/heads/master: c6dbf554bc8a79c9caab3dbf891a33c19068f646 diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c index d9b408113921..6d57413ac0f5 100644 --- a/trunk/drivers/usb/class/cdc-acm.c +++ b/trunk/drivers/usb/class/cdc-acm.c @@ -804,7 +804,7 @@ static int acm_probe (struct usb_interface *intf, { struct usb_cdc_union_desc *union_header = NULL; struct usb_cdc_country_functional_desc *cfd = NULL; - char *buffer = intf->altsetting->extra; + unsigned char *buffer = intf->altsetting->extra; int buflen = intf->altsetting->extralen; struct usb_interface *control_interface; struct usb_interface *data_interface; @@ -881,9 +881,13 @@ static int acm_probe (struct usb_interface *intf, if ((call_management_function & 3) != 3) err("This device cannot do calls on its own. It is no modem."); break; - default: - err("Ignoring extra header, type %d, length %d", buffer[2], buffer[0]); + /* there are LOTS more CDC descriptors that + * could legitimately be found here. + */ + dev_dbg(&intf->dev, "Ignoring descriptor: " + "type %02x, length %d\n", + buffer[2], buffer[0]); break; } next_desc: