[PATCH net-next 2/5] net: qmi_wwan: manage_power should always set needs_remote_wakeup

[Bjørn Mork]

Reported-by: Oliver Neukum <oneu...@suse.de>
Signed-off-by: Bjørn Mork <bj...@mork.no>
---
 drivers/net/usb/qmi_wwan.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index e0a4a2b..5dd0d85 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)
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html