aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-06-04 10:37:19 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-04 10:37:19 -0700
commit5563169c1b3c2e77b47211beda429319c3f93bf3 (patch)
treeaa41dc29d6199874b1dd908614f64fc7857d031c /usb
parent17b093ed04b5e4b75f729727bc7de395b23b97ad (diff)
downloadpatches-5563169c1b3c2e77b47211beda429319c3f93bf3.tar.gz
fix build error in usb/usb-usb-serial-replace-shutdown-with-disconnect-release.patch
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-usb-serial-replace-shutdown-with-disconnect-release.patch23
1 files changed, 22 insertions, 1 deletions
diff --git a/usb/usb-usb-serial-replace-shutdown-with-disconnect-release.patch b/usb/usb-usb-serial-replace-shutdown-with-disconnect-release.patch
index a6e43c3e2c296f..3e7edc4b3299ed 100644
--- a/usb/usb-usb-serial-replace-shutdown-with-disconnect-release.patch
+++ b/usb/usb-usb-serial-replace-shutdown-with-disconnect-release.patch
@@ -21,6 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
+ drivers/staging/uc2322/aten2011.c | 4 +--
drivers/usb/serial/aircable.c | 5 +---
drivers/usb/serial/belkin_sa.c | 7 ++---
drivers/usb/serial/cp210x.c | 6 ++--
@@ -57,8 +58,28 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/serial/visor.c | 13 ++++------
drivers/usb/serial/whiteheat.c | 6 ++--
include/linux/usb/serial.h | 12 ++++++---
- 36 files changed, 317 insertions(+), 198 deletions(-)
+ 37 files changed, 319 insertions(+), 200 deletions(-)
+--- a/drivers/staging/uc2322/aten2011.c
++++ b/drivers/staging/uc2322/aten2011.c
+@@ -2336,7 +2336,7 @@ static int ATEN2011_startup(struct usb_s
+ return 0;
+ }
+
+-static void ATEN2011_shutdown(struct usb_serial *serial)
++static void ATEN2011_release(struct usb_serial *serial)
+ {
+ int i;
+ struct ATENINTL_port *ATEN2011_port;
+@@ -2382,7 +2382,7 @@ static struct usb_serial_driver aten_ser
+ .tiocmget = ATEN2011_tiocmget,
+ .tiocmset = ATEN2011_tiocmset,
+ .attach = ATEN2011_startup,
+- .shutdown = ATEN2011_shutdown,
++ .release = ATEN2011_release,
+ .read_bulk_callback = ATEN2011_bulk_in_callback,
+ .read_int_callback = ATEN2011_interrupt_callback,
+ };
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -364,7 +364,7 @@ static int aircable_attach(struct usb_se