lkml.org 
[lkml]   [2014]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 062/166] usb: cdc-wdm: manage_power should always set needs_remote_wakeup
    Date
    3.8.13.16 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>

    commit 4144bc861ed7934d56f16d2acd808d44af0fcc90 upstream.

    Reported-by: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: Bjørn Mork <bjorn@mork.no>
    Acked-by: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/usb/class/cdc-wdm.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
    index 46c9379..59f7d32 100644
    --- a/drivers/usb/class/cdc-wdm.c
    +++ b/drivers/usb/class/cdc-wdm.c
    @@ -801,13 +801,11 @@ static int wdm_manage_power(struct usb_interface *intf, int on)
    {
    /* need autopm_get/put here to ensure the usbcore sees the new value */
    int rv = usb_autopm_get_interface(intf);
    - if (rv < 0)
    - goto err;

    intf->needs_remote_wakeup = on;
    - usb_autopm_put_interface(intf);
    -err:
    - return rv;
    + if (!rv)
    + usb_autopm_put_interface(intf);
    + return 0;
    }

    static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)
    --
    1.8.3.2
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-01-16 00:01    [W:4.171 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site