diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-04 20:59:19 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-04 20:59:25 -0500 |
| commit | 435c724232457f32e66d6460d036c5f64f67b0a7 (patch) | |
| tree | c8448eaee30e46627ab89bb481fd88017a8d3ff5 /drivers/usb/host/xhci.c | |
| parent | d8cae98cddd286e38db1724dda1b0e7b467f9237 (diff) | |
| parent | e910b440da9f766f2623479be721032fecff98c3 (diff) | |
Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next
* 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:
xhci: Clean up 32-bit build warnings.
xhci: Properly handle COMP_2ND_BW_ERR
Diffstat (limited to 'drivers/usb/host/xhci.c')
| -rw-r--r-- | drivers/usb/host/xhci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index dda84756c465..6bbe3c3a7111 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
| @@ -1623,6 +1623,7 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci, | |||
| 1623 | /* FIXME: can we allocate more resources for the HC? */ | 1623 | /* FIXME: can we allocate more resources for the HC? */ |
| 1624 | break; | 1624 | break; |
| 1625 | case COMP_BW_ERR: | 1625 | case COMP_BW_ERR: |
| 1626 | case COMP_2ND_BW_ERR: | ||
| 1626 | dev_warn(&udev->dev, "Not enough bandwidth " | 1627 | dev_warn(&udev->dev, "Not enough bandwidth " |
| 1627 | "for new device state.\n"); | 1628 | "for new device state.\n"); |
| 1628 | ret = -ENOSPC; | 1629 | ret = -ENOSPC; |