]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
usbnet: clear OPEN flag in failure path
authorMing Lei <ming.lei@canonical.com>
Tue, 19 Jun 2012 21:15:51 +0000 (21:15 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 23 Jun 2012 00:34:17 +0000 (17:34 -0700)
Without clearing OPEN flag in failure path, runtime or system resume
may submit interrupt/rx URB and start tx queue mistakenly on a
interface in DOWN state.

Signed-off-by: Ming Lei <ming.lei@canonical.com>
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/usbnet.c

index d4f7256a607dafd882065d4379198a60f2aff92f..815493caea7f5823069efa836fb5dc9a93ea47ae 100644 (file)
@@ -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: