|
@@ -778,7 +778,7 @@ int usbnet_stop (struct net_device *net)
|
|
{
|
|
{
|
|
struct usbnet *dev = netdev_priv(net);
|
|
struct usbnet *dev = netdev_priv(net);
|
|
struct driver_info *info = dev->driver_info;
|
|
struct driver_info *info = dev->driver_info;
|
|
- int retval, pm;
|
|
|
|
|
|
+ int retval, pm, mpn;
|
|
|
|
|
|
clear_bit(EVENT_DEV_OPEN, &dev->flags);
|
|
clear_bit(EVENT_DEV_OPEN, &dev->flags);
|
|
netif_stop_queue (net);
|
|
netif_stop_queue (net);
|
|
@@ -809,6 +809,8 @@ int usbnet_stop (struct net_device *net)
|
|
|
|
|
|
usbnet_purge_paused_rxq(dev);
|
|
usbnet_purge_paused_rxq(dev);
|
|
|
|
|
|
|
|
+ mpn = !test_and_clear_bit(EVENT_NO_RUNTIME_PM, &dev->flags);
|
|
|
|
+
|
|
/* deferred work (task, timer, softirq) must also stop.
|
|
/* deferred work (task, timer, softirq) must also stop.
|
|
* can't flush_scheduled_work() until we drop rtnl (later),
|
|
* can't flush_scheduled_work() until we drop rtnl (later),
|
|
* else workers could deadlock; so make workers a NOP.
|
|
* else workers could deadlock; so make workers a NOP.
|
|
@@ -819,8 +821,7 @@ int usbnet_stop (struct net_device *net)
|
|
if (!pm)
|
|
if (!pm)
|
|
usb_autopm_put_interface(dev->intf);
|
|
usb_autopm_put_interface(dev->intf);
|
|
|
|
|
|
- if (info->manage_power &&
|
|
|
|
- !test_and_clear_bit(EVENT_NO_RUNTIME_PM, &dev->flags))
|
|
|
|
|
|
+ if (info->manage_power && mpn)
|
|
info->manage_power(dev, 0);
|
|
info->manage_power(dev, 0);
|
|
else
|
|
else
|
|
usb_autopm_put_interface(dev->intf);
|
|
usb_autopm_put_interface(dev->intf);
|