diff options
| author | Bjørn Mork <bjorn@mork.no> | 2013-11-01 14:18:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-04 15:40:16 -0500 |
| commit | 79d9b62ad839f69593e7aa06790a2f1425c02462 (patch) | |
| tree | 3c46e00d8a45f2d4e3e2bf99c6a69c52aa7f327b | |
| parent | 04d948a9fc7b352b05125bd3d81c565fb8840c56 (diff) | |
| download | linux-79d9b62ad839f69593e7aa06790a2f1425c02462.tar.gz linux-79d9b62ad839f69593e7aa06790a2f1425c02462.tar.bz2 linux-79d9b62ad839f69593e7aa06790a2f1425c02462.zip | |
net: qmi_wwan: 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>
| -rw-r--r-- | drivers/net/usb/qmi_wwan.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index e0a4a2b08e45..5dd0d85e6335 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -149,7 +149,7 @@ static const struct net_device_ops qmi_wwan_netdev_ops = { static int qmi_wwan_manage_power(struct usbnet *dev, int on) { struct qmi_wwan_state *info = (void *)&dev->data; - int rv = 0; + int rv; dev_dbg(&dev->intf->dev, "%s() pmcount=%d, on=%d\n", __func__, atomic_read(&info->pmcount), on); @@ -160,13 +160,11 @@ static int qmi_wwan_manage_power(struct usbnet *dev, int on) * 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 qmi_wwan_cdc_wdm_manage_power(struct usb_interface *intf, int on) |