From f1d0d06003071c4b36e6082c82f60eabc418f38d Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 May 2012 14:10:27 -0700
Subject: [PATCH] --- yaml --- r: 303854 b: refs/heads/master c:
 2bfd1c96a9fb9b547db9a2ad8428dc8de5526e92 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/usb/serial/ch341.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 2fbe01d1e261..23539babb2d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32078f915d1acab356080b144aa89fe3487f3979
+refs/heads/master: 2bfd1c96a9fb9b547db9a2ad8428dc8de5526e92
diff --git a/trunk/drivers/usb/serial/ch341.c b/trunk/drivers/usb/serial/ch341.c
index 4f0260a9013a..95b259747697 100644
--- a/trunk/drivers/usb/serial/ch341.c
+++ b/trunk/drivers/usb/serial/ch341.c
@@ -577,27 +577,20 @@ static int ch341_tiocmget(struct tty_struct *tty)
 	return result;
 }
 
-
-static int ch341_reset_resume(struct usb_interface *intf)
+static int ch341_resume(struct usb_serial *serial)
 {
-	struct usb_device *dev = interface_to_usbdev(intf);
-	struct usb_serial *serial = NULL;
 	struct ch341_private *priv;
 
-	serial = usb_get_intfdata(intf);
 	priv = usb_get_serial_port_data(serial->port[0]);
 
-	/*reconfigure ch341 serial port after bus-reset*/
-	ch341_configure(dev, priv);
-
-	usb_serial_resume(intf);
+	/* reconfigure ch341 serial port after bus-reset */
+	ch341_configure(serial->dev, priv);
 
 	return 0;
 }
 
 static struct usb_driver ch341_driver = {
 	.name		= "ch341",
-	.reset_resume	= ch341_reset_resume,
 	.id_table	= id_table,
 };
 
@@ -619,6 +612,7 @@ static struct usb_serial_driver ch341_device = {
 	.tiocmset          = ch341_tiocmset,
 	.read_int_callback = ch341_read_int_callback,
 	.attach            = ch341_attach,
+	.resume            = ch341_resume,
 };
 
 static struct usb_serial_driver * const serial_drivers[] = {