From d09f78a0f7cddbd9979e56a972b7ef1c9c6eeb19 Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@canonical.com>
Date: Tue, 19 Jun 2012 21:15:51 +0000
Subject: [PATCH] --- yaml --- r: 311410 b: refs/heads/master c:
 fb13c47b8e5ce707268bd38cfd082da377eac4b7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 29c21549f847..1febebff1f18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9f90eb2740203ff2592efe640409ad48335d1c2
+refs/heads/master: fb13c47b8e5ce707268bd38cfd082da377eac4b7
diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c
index d4f7256a607d..815493caea7f 100644
--- a/trunk/drivers/net/usb/usbnet.c
+++ b/trunk/drivers/net/usb/usbnet.c
@@ -796,11 +796,13 @@ int usbnet_open (struct net_device *net)
 	if (info->manage_power) {
 		retval = info->manage_power(dev, 1);
 		if (retval < 0)
-			goto done;
+			goto done_manage_power_error;
 		usb_autopm_put_interface(dev->intf);
 	}
 	return retval;
 
+done_manage_power_error:
+	clear_bit(EVENT_DEV_OPEN, &dev->flags);
 done:
 	usb_autopm_put_interface(dev->intf);
 done_nopm: