lkml.org 
[lkml]   [2016]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 46/98] usb: hub: fix a typo in hub_port_init() leading to wrong logic
    Date
    From: Oliver Neukum <oneukum@suse.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 0d5ce778c43bf888328231bcdce05d5c860655aa upstream.

    A typo of j for i led to a logic bug. To rule out future
    confusion, the variable names are made meaningful.

    Signed-off-by: Oliver Neukum <ONeukum@suse.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/usb/core/hub.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
    index 066e9af4d4db..0519b6f5b86f 100644
    --- a/drivers/usb/core/hub.c
    +++ b/drivers/usb/core/hub.c
    @@ -4064,7 +4064,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,

    struct usb_device *hdev = hub->hdev;
    struct usb_hcd *hcd = bus_to_hcd(hdev->bus);
    - int i, j, retval;
    + int retries, operations, retval, i;
    unsigned delay = HUB_SHORT_RESET_TIME;
    enum usb_device_speed oldspeed = udev->speed;
    const char *speed;
    @@ -4166,7 +4166,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
    * first 8 bytes of the device descriptor to get the ep0 maxpacket
    * value.
    */
    - for (i = 0; i < GET_DESCRIPTOR_TRIES; (++i, msleep(100))) {
    + for (retries = 0; retries < GET_DESCRIPTOR_TRIES; (++retries, msleep(100))) {
    if (USE_NEW_SCHEME(retry_counter) && !(hcd->driver->flags & HCD_USB3)) {
    struct usb_device_descriptor *buf;
    int r = 0;
    @@ -4182,7 +4182,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
    * 255 is for WUSB devices, we actually need to use
    * 512 (WUSB1.0[4.8.1]).
    */
    - for (j = 0; j < 3; ++j) {
    + for (operations = 0; operations < 3; ++operations) {
    buf->bMaxPacketSize0 = 0;
    r = usb_control_msg(udev, usb_rcvaddr0pipe(),
    USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
    @@ -4208,7 +4208,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
    * reset. But only on the first attempt,
    * lest we get into a time out/reset loop
    */
    - if (r == 0 || (r == -ETIMEDOUT && j == 0))
    + if (r == 0 || (r == -ETIMEDOUT && retries == 0))
    break;
    }
    udev->descriptor.bMaxPacketSize0 =
    @@ -4240,7 +4240,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
    * authorization will assign the final address.
    */
    if (udev->wusb == 0) {
    - for (j = 0; j < SET_ADDRESS_TRIES; ++j) {
    + for (operations = 0; operations < SET_ADDRESS_TRIES; ++operations) {
    retval = hub_set_address(udev, devnum);
    if (retval >= 0)
    break;
    --
    2.8.1
    \
     
     \ /
      Last update: 2016-04-11 16:02    [W:4.045 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site