diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-04 17:59:19 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-04 17:59:25 -0800 |
| commit | 435c724232457f32e66d6460d036c5f64f67b0a7 (patch) | |
| tree | c8448eaee30e46627ab89bb481fd88017a8d3ff5 | |
| 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
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 6 | ||||
| -rw-r--r-- | drivers/usb/host/xhci.c | 1 | ||||
| -rw-r--r-- | drivers/usb/host/xhci.h | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index b0a85459652..b90e1386418 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1934,7 +1934,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, if (!xdev) { xhci_err(xhci, "ERROR Transfer event pointed to bad slot\n"); xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n", - xhci_trb_virt_to_dma(xhci->event_ring->deq_seg, + (unsigned long long) xhci_trb_virt_to_dma( + xhci->event_ring->deq_seg, xhci->event_ring->dequeue), lower_32_bits(le64_to_cpu(event->buffer)), upper_32_bits(le64_to_cpu(event->buffer)), @@ -1956,7 +1957,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, xhci_err(xhci, "ERROR Transfer event for disabled endpoint " "or incorrect stream ring\n"); xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n", - xhci_trb_virt_to_dma(xhci->event_ring->deq_seg, + (unsigned long long) xhci_trb_virt_to_dma( + xhci->event_ring->deq_seg, xhci->event_ring->dequeue), lower_32_bits(le64_to_cpu(event->buffer)), upper_32_bits(le64_to_cpu(event->buffer)), diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index dda84756c46..6bbe3c3a711 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, /* FIXME: can we allocate more resources for the HC? */ break; case COMP_BW_ERR: + case COMP_2ND_BW_ERR: dev_warn(&udev->dev, "Not enough bandwidth " "for new device state.\n"); ret = -ENOSPC; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index ecd2ad5d226..fb99c837914 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1033,7 +1033,6 @@ struct xhci_transfer_event { /* Invalid Stream ID Error */ #define COMP_STRID_ERR 34 /* Secondary Bandwidth Error - may be returned by a Configure Endpoint cmd */ -/* FIXME - check for this */ #define COMP_2ND_BW_ERR 35 /* Split Transaction Error */ #define COMP_SPLIT_ERR 36 |