From d9bfe7fafe5681a3a7dd59494118c50b3bf6ecf4 Mon Sep 17 00:00:00 2001
From: Sarah Sharp <sarah.a.sharp@intel.com>
Date: Thu, 25 Oct 2007 10:58:43 -0700
Subject: [PATCH] --- yaml --- r: 72583 b: refs/heads/master c:
 8abaee238ebb1ef9b8bcafac7a1833f92e7f2319 h: refs/heads/master i:   72581:
 7fa5f5109530a8346b259e4e9e2bee4cc479b39a   72579:
 b71fcb73ae7e3a50b9ca8165f6825ea9f5c81afa   72575:
 2fc1927f5437e162942886a54400af42a2de8f57 v: v3

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

diff --git a/[refs] b/[refs]
index 8e193f88ea9a..0ab9f3c171e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da6fb5704feeadd10b99a1025166f1a3f627825d
+refs/heads/master: 8abaee238ebb1ef9b8bcafac7a1833f92e7f2319
diff --git a/trunk/drivers/usb/serial/usb-serial.c b/trunk/drivers/usb/serial/usb-serial.c
index 426afaa0d9b8..497e29a700ca 100644
--- a/trunk/drivers/usb/serial/usb-serial.c
+++ b/trunk/drivers/usb/serial/usb-serial.c
@@ -1123,7 +1123,9 @@ int usb_serial_resume(struct usb_interface *intf)
 {
 	struct usb_serial *serial = usb_get_intfdata(intf);
 
-	return serial->type->resume(serial);
+	if (serial->type->resume)
+		return serial->type->resume(serial);
+	return 0;
 }
 EXPORT_SYMBOL(usb_serial_resume);