diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2013-11-01 14:18:52 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-11-04 15:40:16 -0500 |
| commit | 04d948a9fc7b352b05125bd3d81c565fb8840c56 (patch) | |
| tree | e7981162dfdba15a3e88bff2a75b89daf876d5ec /drivers/net/usb/cdc_mbim.c | |
| parent | Merge branch 'qlcnic' (diff) | |
| download | linux-dev-04d948a9fc7b352b05125bd3d81c565fb8840c56.tar.xz linux-dev-04d948a9fc7b352b05125bd3d81c565fb8840c56.zip | |
net: cdc_mbim: manage_power should always set needs_remote_wakeup
Reported-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/usb/cdc_mbim.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c index af76aaf08b6b..fbfd67fe6a9a 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c @@ -44,13 +44,11 @@ static int cdc_mbim_manage_power(struct usbnet *dev, int on) if ((on && atomic_add_return(1, &info->pmcount) == 1) || (!on && atomic_dec_and_test(&info->pmcount))) { /* need autopm_get/put here to ensure the usbcore sees the new value */ rv = usb_autopm_get_interface(dev->intf); - if (rv < 0) - goto err; dev->intf->needs_remote_wakeup = on; - usb_autopm_put_interface(dev->intf); + if (!rv) + usb_autopm_put_interface(dev->intf); } -err: - return rv; + return 0; } static int cdc_mbim_wdm_manage_power(struct usb_interface *intf, int status) |