evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: don't update devnum for wusb devices

Browse source 
For WUSB devices, usb_dev.devnum is a device index and not the real
device address (which is managed by wusbcore).  Therefore, only set
devnum once (in choose_address()) and never change it.

Signed-off-by: David Vrabel <david.vrabel@csr.com>
Cc: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
David Vrabel 2008-04-08 13:24:46 -07:00 • committed by Greg Kroah-Hartman
parent fc721f5194
commit 4953d141dc
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/usb/core/hub.c
View file

@ -1245,6 +1245,13 @@ static void release_address(struct usb_device *udev)
} }
} }
static void update_address(struct usb_device *udev, int devnum)
{
/* The address for a WUSB device is managed by wusbcore. */
if (!udev->wusb)
udev->devnum = devnum;
}
#ifdef CONFIG_USB_SUSPEND #ifdef CONFIG_USB_SUSPEND
static void usb_stop_pm(struct usb_device *udev) static void usb_stop_pm(struct usb_device *udev)
@ -1733,7 +1740,7 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
case 0: case 0:
/* TRSTRCY = 10 ms; plus some extra */ /* TRSTRCY = 10 ms; plus some extra */
msleep(10 + 40); msleep(10 + 40);
udev->devnum = 0; /* Device now at address 0 */ update_address(udev, 0);
/* FALL THROUGH */ /* FALL THROUGH */
case -ENOTCONN: case -ENOTCONN:
case -ENODEV: case -ENODEV:
@ -2236,7 +2243,8 @@ static int hub_set_address(struct usb_device *udev, int devnum)
USB_REQ_SET_ADDRESS, 0, devnum, 0, USB_REQ_SET_ADDRESS, 0, devnum, 0,
NULL, 0, USB_CTRL_SET_TIMEOUT); NULL, 0, USB_CTRL_SET_TIMEOUT);
if (retval == 0) { if (retval == 0) {
udev->devnum = devnum; /* Device now using proper address */ /* Device now using proper address. */
update_address(udev, devnum);
usb_set_device_state(udev, USB_STATE_ADDRESS); usb_set_device_state(udev, USB_STATE_ADDRESS);
usb_ep0_reinit(udev); usb_ep0_reinit(udev);
} }
@ -2491,7 +2499,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
fail: fail:
if (retval) { if (retval) {
hub_port_disable(hub, port1, 0); hub_port_disable(hub, port1, 0);
udev->devnum = devnum; /* for disconnect processing */ update_address(udev, devnum); /* for disconnect processing */
} }
mutex_unlock(&usb_address0_mutex); mutex_unlock(&usb_address0_mutex);
return retval; return retval;