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

Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next

Browse source 
* '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
This commit is contained in:
Greg Kroah-Hartman 2012-01-04 17:59:19 -08:00
commit 435c724232
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/host/xhci-ring.c
View file

@ -1934,7 +1934,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
if (!xdev) { if (!xdev) {
xhci_err(xhci, "ERROR Transfer event pointed to bad slot\n"); xhci_err(xhci, "ERROR Transfer event pointed to bad slot\n");
xhci_err(xhci, "@%016llx %08x %08x %08x %08x\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), xhci->event_ring->dequeue),
lower_32_bits(le64_to_cpu(event->buffer)), lower_32_bits(le64_to_cpu(event->buffer)),
upper_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 " xhci_err(xhci, "ERROR Transfer event for disabled endpoint "
"or incorrect stream ring\n"); "or incorrect stream ring\n");
xhci_err(xhci, "@%016llx %08x %08x %08x %08x\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), xhci->event_ring->dequeue),
lower_32_bits(le64_to_cpu(event->buffer)), lower_32_bits(le64_to_cpu(event->buffer)),
upper_32_bits(le64_to_cpu(event->buffer)), upper_32_bits(le64_to_cpu(event->buffer)),

1
drivers/usb/host/xhci.c
View file

@ -1623,6 +1623,7 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
/* FIXME: can we allocate more resources for the HC? */ /* FIXME: can we allocate more resources for the HC? */
break; break;
case COMP_BW_ERR: case COMP_BW_ERR:
case COMP_2ND_BW_ERR:
dev_warn(&udev->dev, "Not enough bandwidth " dev_warn(&udev->dev, "Not enough bandwidth "
"for new device state.\n"); "for new device state.\n");
ret = -ENOSPC; ret = -ENOSPC;

1
drivers/usb/host/xhci.h
View file

@ -1033,7 +1033,6 @@ struct xhci_transfer_event {
/* Invalid Stream ID Error */ /* Invalid Stream ID Error */
#define COMP_STRID_ERR 34 #define COMP_STRID_ERR 34
/* Secondary Bandwidth Error - may be returned by a Configure Endpoint cmd */ /* Secondary Bandwidth Error - may be returned by a Configure Endpoint cmd */
/* FIXME - check for this */
#define COMP_2ND_BW_ERR 35 #define COMP_2ND_BW_ERR 35
/* Split Transaction Error */ /* Split Transaction Error */
#define COMP_SPLIT_ERR 36 #define COMP_SPLIT_ERR 36