From c0775a7c64888fd0c4e1cdc298913bf4bf238e0f Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 16 May 2012 08:37:17 -0700
Subject: [PATCH] --- yaml --- r: 303968 b: refs/heads/master c:
 dcd82cd1c249fb85bad3da5d2a07a116cd65a22b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bea9d39efcf4..ecebf24b8a4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c1eaba8e72768156db4faff3a2c3a6ca7dea129
+refs/heads/master: dcd82cd1c249fb85bad3da5d2a07a116cd65a22b
diff --git a/trunk/drivers/usb/serial/usb-serial.c b/trunk/drivers/usb/serial/usb-serial.c
index 846506f05e12..6a1b609a0d94 100644
--- a/trunk/drivers/usb/serial/usb-serial.c
+++ b/trunk/drivers/usb/serial/usb-serial.c
@@ -1176,8 +1176,10 @@ static int usb_serial_reset_resume(struct usb_interface *intf)
 	serial->suspending = 0;
 	if (serial->type->reset_resume)
 		rv = serial->type->reset_resume(serial);
-	else
-		rv = usb_serial_generic_resume(serial);
+	else {
+		rv = -EOPNOTSUPP;
+		intf->needs_binding = 1;
+	}
 
 	return rv;
 }