diff options
author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2009-12-09 18:59:17 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:53:12 -0500 |
commit | a5f0efaba4c2b644e6248648f75b0a8a522359f6 (patch) | |
tree | 62b899d29b3089dc2ce2f7037dc43cde34501b4c /drivers/usb/host | |
parent | 2a8f82c4ceaffcfd64531dbdee1d1bc227387882 (diff) |
USB: Add call to notify xHC of a device reset.
Add a new host controller driver method, reset_device(), that the USB core
will use to notify the host of a successful device reset. The call may
fail due to out-of-memory errors; attempt the port reset sequence again if
that happens. Update hub_port_init() to allow resetting a configured
device.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/xhci-pci.c | 1 | ||||
-rw-r--r-- | drivers/usb/host/xhci.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index e097008d6fb1..417d37aff8d7 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c | |||
@@ -139,6 +139,7 @@ static const struct hc_driver xhci_pci_hc_driver = { | |||
139 | .reset_bandwidth = xhci_reset_bandwidth, | 139 | .reset_bandwidth = xhci_reset_bandwidth, |
140 | .address_device = xhci_address_device, | 140 | .address_device = xhci_address_device, |
141 | .update_hub_device = xhci_update_hub_device, | 141 | .update_hub_device = xhci_update_hub_device, |
142 | .reset_device = xhci_reset_device, | ||
142 | 143 | ||
143 | /* | 144 | /* |
144 | * scheduling support | 145 | * scheduling support |
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index feb0101f91eb..741ece482e31 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
@@ -1270,6 +1270,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status); | |||
1270 | int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev, struct usb_host_endpoint *ep); | 1270 | int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev, struct usb_host_endpoint *ep); |
1271 | int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev, struct usb_host_endpoint *ep); | 1271 | int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev, struct usb_host_endpoint *ep); |
1272 | void xhci_endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep); | 1272 | void xhci_endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep); |
1273 | int xhci_reset_device(struct usb_hcd *hcd, struct usb_device *udev); | ||
1273 | int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev); | 1274 | int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev); |
1274 | void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev); | 1275 | void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev); |
1275 | 1276 | ||