← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-lts-vivid/trusty-proposed

« back to all changes in this revision

Viewing changes to drivers/net/usb/usbnet.c

  • Committer: Package Import Robot
  • Author(s): Luis Henriques, Kamal Mostafa, K. Y. Srinivasan
  • Date: 2015-11-23 13:24:32 UTC
  • Revision ID: package-import@ubuntu.com-20151123132432-903xk653el60bfun
https://launchpad.net/bugs/1518519
https://launchpad.net/bugs/1508706
[ Kamal Mostafa ]

* Release Tracking Bug
  - LP: #1518519

[ K. Y. Srinivasan ]

* SAUCE: Drivers: hv: vmbus: Fix a Host signaling bug
  - LP: #1508706

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/usb/usbnet.c
779
779
{
780
780
        struct usbnet           *dev = netdev_priv(net);
781
781
        struct driver_info      *info = dev->driver_info;
782
 
        int                     retval, pm;
 
782
        int                     retval, pm, mpn;
783
783
 
784
784
        clear_bit(EVENT_DEV_OPEN, &dev->flags);
785
785
        netif_stop_queue (net);
810
810
 
811
811
        usbnet_purge_paused_rxq(dev);
812
812
 
 
813
        mpn = !test_and_clear_bit(EVENT_NO_RUNTIME_PM, &dev->flags);
 
814
 
813
815
        /* deferred work (task, timer, softirq) must also stop.
814
816
         * can't flush_scheduled_work() until we drop rtnl (later),
815
817
         * else workers could deadlock; so make workers a NOP.
820
822
        if (!pm)
821
823
                usb_autopm_put_interface(dev->intf);
822
824
 
823
 
        if (info->manage_power &&
824
 
            !test_and_clear_bit(EVENT_NO_RUNTIME_PM, &dev->flags))
 
825
        if (info->manage_power && mpn)
825
826
                info->manage_power(dev, 0);
826
827
        else
827
828
                usb_autopm_put_interface(dev->intf);