lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 069/134] usb: gadget: dummy_hcd: Fix wrong power status bit clear/reset in dummy_hub_control()
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Yuyang Du <yuyang.du@intel.com>


    [ Upstream commit 9f20dfb44d03745d0d3cef2ffb3abf8d8024fa61 ]

    This fixes the commit: 1cd8fd2887e1 ("usb: gadget: dummy_hcd: add
    SuperSpeed support").

    In the case of ClearPortFeature and USB_PORT_FEAT_POWER, simply clear
    the right bit regardless of what the wValue is.

    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Yuyang Du <yuyang.du@intel.com>
    Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/usb/gadget/udc/dummy_hcd.c | 20 ++++++++------------
    1 file changed, 8 insertions(+), 12 deletions(-)

    --- a/drivers/usb/gadget/udc/dummy_hcd.c
    +++ b/drivers/usb/gadget/udc/dummy_hcd.c
    @@ -2105,16 +2105,13 @@ static int dummy_hub_control(
    }
    break;
    case USB_PORT_FEAT_POWER:
    - if (hcd->speed == HCD_USB3) {
    - if (dum_hcd->port_status & USB_PORT_STAT_POWER)
    - dev_dbg(dummy_dev(dum_hcd),
    - "power-off\n");
    - } else
    - if (dum_hcd->port_status &
    - USB_SS_PORT_STAT_POWER)
    - dev_dbg(dummy_dev(dum_hcd),
    - "power-off\n");
    - /* FALLS THROUGH */
    + dev_dbg(dummy_dev(dum_hcd), "power-off\n");
    + if (hcd->speed == HCD_USB3)
    + dum_hcd->port_status &= ~USB_SS_PORT_STAT_POWER;
    + else
    + dum_hcd->port_status &= ~USB_PORT_STAT_POWER;
    + set_link_state(dum_hcd);
    + break;
    default:
    dum_hcd->port_status &= ~(1 << wValue);
    set_link_state(dum_hcd);
    @@ -2285,14 +2282,13 @@ static int dummy_hub_control(
    if ((dum_hcd->port_status &
    USB_SS_PORT_STAT_POWER) != 0) {
    dum_hcd->port_status |= (1 << wValue);
    - set_link_state(dum_hcd);
    }
    } else
    if ((dum_hcd->port_status &
    USB_PORT_STAT_POWER) != 0) {
    dum_hcd->port_status |= (1 << wValue);
    - set_link_state(dum_hcd);
    }
    + set_link_state(dum_hcd);
    }
    break;
    case GetPortErrorCount:

    \
     
     \ /
      Last update: 2018-03-19 19:16    [W:3.827 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site