aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-05-16 10:32:23 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-16 10:32:23 -0700
commitc6b34ab7479abe3a1de929ea17d7b69781adb76e (patch)
tree1e6ede65aa9f18aaa464b4172d95d8b26b97790d /usb.current
parentccc6eb1a17cad6e98b5a5b6b6fa1856951385a22 (diff)
downloadpatches-c6b34ab7479abe3a1de929ea17d7b69781adb76e.tar.gz
cdc-wdm update from Oliver
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/usb-cdc-wdm-driver.patch54
1 files changed, 27 insertions, 27 deletions
diff --git a/usb.current/usb-cdc-wdm-driver.patch b/usb.current/usb-cdc-wdm-driver.patch
index de652a03ee3d63..676ae8e182ec3e 100644
--- a/usb.current/usb-cdc-wdm-driver.patch
+++ b/usb.current/usb-cdc-wdm-driver.patch
@@ -18,30 +18,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
include/linux/usb/cdc.h | 9
4 files changed, 758 insertions(+)
---- a/drivers/usb/class/Kconfig
-+++ b/drivers/usb/class/Kconfig
-@@ -29,3 +29,14 @@ config USB_PRINTER
- To compile this driver as a module, choose M here: the
- module will be called usblp.
-
-+config USB_WDM
-+ tristate "USB Wireless Device Management support"
-+ depends on USB
-+ ---help---
-+ This driver supports the WMC Device Management functionality
-+ of cell phones compliant to the CDC WMC specification. You can use
-+ AT commands over this device.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called cdc-wdm.
-+
---- a/drivers/usb/class/Makefile
-+++ b/drivers/usb/class/Makefile
-@@ -5,3 +5,4 @@
-
- obj-$(CONFIG_USB_ACM) += cdc-acm.o
- obj-$(CONFIG_USB_PRINTER) += usblp.o
-+obj-$(CONFIG_USB_WDM) += cdc-wdm.o
--- /dev/null
+++ b/drivers/usb/class/cdc-wdm.c
@@ -0,0 +1,737 @@
@@ -165,13 +141,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ if (status) {
+ switch (status) {
+ case -ENOENT:
-+ err("nonzero urb status received: -ENOENT");
++ dev_dbg(&desc->intf->dev, "nonzero urb status received: -ENOENT");
+ break;
+ case -ECONNRESET:
-+ err("nonzero urb status received: -ECONNRESET");
++ dev_dbg(&desc->intf->dev, "nonzero urb status received: -ECONNRESET");
+ break;
+ case -ESHUTDOWN:
-+ err("nonzero urb status received: -ESHUTDOWN");
++ dev_dbg(&desc->intf->dev, "nonzero urb status received: -ESHUTDOWN");
+ break;
+ case -EPIPE:
+ err("nonzero urb status received: -EPIPE");
@@ -782,6 +758,30 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+MODULE_DESCRIPTION("USB Abstract Control Model driver for "
+ "USB WCM Device Management");
+MODULE_LICENSE("GPL");
+--- a/drivers/usb/class/Kconfig
++++ b/drivers/usb/class/Kconfig
+@@ -29,3 +29,14 @@ config USB_PRINTER
+ To compile this driver as a module, choose M here: the
+ module will be called usblp.
+
++config USB_WDM
++ tristate "USB Wireless Device Management support"
++ depends on USB
++ ---help---
++ This driver supports the WMC Device Management functionality
++ of cell phones compliant to the CDC WMC specification. You can use
++ AT commands over this device.
++
++ To compile this driver as a module, choose M here: the
++ module will be called cdc-wdm.
++
+--- a/drivers/usb/class/Makefile
++++ b/drivers/usb/class/Makefile
+@@ -5,3 +5,4 @@
+
+ obj-$(CONFIG_USB_ACM) += cdc-acm.o
+ obj-$(CONFIG_USB_PRINTER) += usblp.o
++obj-$(CONFIG_USB_WDM) += cdc-wdm.o
--- a/include/linux/usb/cdc.h
+++ b/include/linux/usb/cdc.h
@@ -130,6 +130,15 @@ struct usb_cdc_ether_desc {