From dc40a31c46e567a29cf76f117a5b262283772e72 Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@canonical.com>
Date: Fri, 15 Mar 2013 12:08:59 +0800
Subject: [PATCH] --- yaml --- r: 364368 b: refs/heads/master c:
 5410a473fb7a466020af31e8b400c2d14ed94925 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ea07fb5d7751..2349d95fa525 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d41be53f0a65c52f3099d9a4b4fa6e1bca07be8
+refs/heads/master: 5410a473fb7a466020af31e8b400c2d14ed94925
diff --git a/trunk/drivers/net/usb/smsc75xx.c b/trunk/drivers/net/usb/smsc75xx.c
index 9abe51710f22..21b607ab86f2 100644
--- a/trunk/drivers/net/usb/smsc75xx.c
+++ b/trunk/drivers/net/usb/smsc75xx.c
@@ -2011,7 +2011,11 @@ static int smsc75xx_suspend(struct usb_interface *intf, pm_message_t message)
 	ret = smsc75xx_enter_suspend0(dev);
 
 done:
-	if (ret)
+	/*
+	 * TODO: resume() might need to handle the suspend failure
+	 * in system sleep
+	 */
+	if (ret && PMSG_IS_AUTO(message))
 		usbnet_resume(intf);
 	return ret;
 }