---

yaml --- r: 311410 b: refs/heads/master c: fb13c47 h: refs/heads/master v: v3
git-mirror · Jun 23, 2012 · d09f78a · d09f78a
1 parent c5699bc
commit d09f78a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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: