leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: Prepare for refactoring by adding extra udev checks.

Browse Source 
The next patch will refactor the hub port code to rip out the recursive
call to hub_port_reset on a failed hot reset.  In preparation for that,
make sure all code paths can deal with being called with a NULL udev.
The usb_device will not be valid if warm reset was issued because a port
transitioned to the Inactive or Compliance Mode on a device connect.

This patch should have no effect on current behavior.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
This commit is contained in:
Sarah Sharp
2012-12-04 15:27:50 -08:00
parent 0fe51aa5ee
commit 2d4fa940f9
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/usb/core/hub.c
View File

@@ -2584,6 +2584,9 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
return -ENOTCONN; return -ENOTCONN;
if ((portstatus & USB_PORT_STAT_ENABLE)) { if ((portstatus & USB_PORT_STAT_ENABLE)) {
if (!udev)
return 0;
if (hub_is_wusb(hub)) if (hub_is_wusb(hub))
udev->speed = USB_SPEED_WIRELESS; udev->speed = USB_SPEED_WIRELESS;
else if (hub_is_superspeed(hub->hdev)) else if (hub_is_superspeed(hub->hdev))
@@ -2627,13 +2630,15 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
struct usb_hcd *hcd; struct usb_hcd *hcd;
/* TRSTRCY = 10 ms; plus some extra */ /* TRSTRCY = 10 ms; plus some extra */
msleep(10 + 40); msleep(10 + 40);
update_devnum(udev, 0); if (udev) {
hcd = bus_to_hcd(udev->bus); update_devnum(udev, 0);
/* The xHC may think the device is already reset, hcd = bus_to_hcd(udev->bus);
* so ignore the status. /* The xHC may think the device is already
*/ * reset, so ignore the status.
if (hcd->driver->reset_device) */
hcd->driver->reset_device(hcd, udev); if (hcd->driver->reset_device)
hcd->driver->reset_device(hcd, udev);
}
} }
/* FALL THROUGH */ /* FALL THROUGH */
case -ENOTCONN: case -ENOTCONN:
@@ -2647,7 +2652,7 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
clear_port_feature(hub->hdev, port1, clear_port_feature(hub->hdev, port1,
USB_PORT_FEAT_C_PORT_LINK_STATE); USB_PORT_FEAT_C_PORT_LINK_STATE);
} }
if (!warm) if (!warm && udev)
usb_set_device_state(udev, *status usb_set_device_state(udev, *status
? USB_STATE_NOTATTACHED ? USB_STATE_NOTATTACHED
: USB_STATE_DEFAULT); : USB_STATE_DEFAULT);