Commit f5d29b1b authored by Alex Kanavin's avatar Alex Kanavin Committed by Greg Kroah-Hartman

[PATCH] USB: USB CDC OBEX driver

Also, as the full patch isn't going in, can you please apply this tiny
part of it? Somehow the header descriptor was omitted from the CDC ACM
driver, but it's present on my phone (thus giving me the "ignoring extra
header" error when it's plugged in) and in the CDC spec (section 5.2.3.1).
Signed-off-by: default avatarAlex Kanavin <ak@sensi.org>
Signed-Off-By: default avatarOliver Neukum <oliver@neukum.name>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 0bc22f26
......@@ -569,6 +569,8 @@ static int acm_probe (struct usb_interface *intf,
break;
case CDC_COUNTRY_TYPE: /* maybe somehow export */
break; /* for now we ignore it */
case CDC_HEADER_TYPE: /* maybe check version */
break; /* for now we ignore it */
case CDC_AC_MANAGEMENT_TYPE:
ac_management_function = buffer[3];
break;
......@@ -580,7 +582,7 @@ static int acm_probe (struct usb_interface *intf,
break;
default:
err("Ignoring extra header");
err("Ignoring extra header, type %d, length %d", buffer[2], buffer[0]);
break;
}
next_desc:
......
......@@ -117,6 +117,7 @@ struct union_desc {
} __attribute__ ((packed));
/* class specific descriptor types */
#define CDC_HEADER_TYPE 0x00
#define CDC_CALL_MANAGEMENT_TYPE 0x01
#define CDC_AC_MANAGEMENT_TYPE 0x02
#define CDC_UNION_TYPE 0x06
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment