From db07ea6992f84341f0a3d4a6ab3e0e8fc18e7693 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 16 May 2012 08:36:13 -0700
Subject: [PATCH] --- yaml --- r: 303967 b: refs/heads/master c:
 1c1eaba8e72768156db4faff3a2c3a6ca7dea129 h: refs/heads/master i:   303965:
 cae7640b57ebc795e82565d5e12b7c2b7c8f3a1d   303963:
 9bf297fc3404d8f4d6b04b5510821791aceaa62a   303959:
 154a64202a59e7ea483475aa93aa1f24a1d9b9e5   303951:
 9380da91f4271543d92fe502bcc65205d31a74e5   303935:
 9a32d3d69824f94a930d34eb066031c2aa6d259f v: v3

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

diff --git a/[refs] b/[refs]
index 03ca1c546545..bea9d39efcf4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 450279822fb4781b3da2719d8855f4fa1db3a704
+refs/heads/master: 1c1eaba8e72768156db4faff3a2c3a6ca7dea129
diff --git a/trunk/drivers/usb/serial/ch341.c b/trunk/drivers/usb/serial/ch341.c
index 948138539378..cabd1b15ddce 100644
--- a/trunk/drivers/usb/serial/ch341.c
+++ b/trunk/drivers/usb/serial/ch341.c
@@ -607,7 +607,7 @@ static struct usb_serial_driver ch341_device = {
 	.tiocmset          = ch341_tiocmset,
 	.read_int_callback = ch341_read_int_callback,
 	.attach            = ch341_attach,
-	.resume            = ch341_reset_resume,
+	.reset_resume      = ch341_reset_resume,
 };
 
 static struct usb_serial_driver * const serial_drivers[] = {