ChangeSet 1.2144, 2004/10/18 14:41:41-07:00, [EMAIL PROTECTED]
[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: Alex Kanavin <[EMAIL PROTECTED]>
Signed-Off-By: Oliver Neukum <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
drivers/usb/class/cdc-acm.c | 4 +++-
drivers/usb/class/cdc-acm.h | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff -Nru a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
--- a/drivers/usb/class/cdc-acm.c 2004-10-19 08:05:08 -07:00
+++ b/drivers/usb/class/cdc-acm.c 2004-10-19 08:05:08 -07:00
@@ -569,6 +569,8 @@
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 @@
break;
default:
- err("Ignoring extra header");
+ err("Ignoring extra header, type %d, length %d",
buffer[2], buffer[0]);
break;
}
next_desc:
diff -Nru a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
--- a/drivers/usb/class/cdc-acm.h 2004-10-19 08:05:08 -07:00
+++ b/drivers/usb/class/cdc-acm.h 2004-10-19 08:05:08 -07:00
@@ -117,6 +117,7 @@
} __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
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
