diff options
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 4794905d38d7..f1ae17234032 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
| @@ -167,9 +167,7 @@ static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring, bool consumer | |||
| 167 | next = ring->dequeue; | 167 | next = ring->dequeue; |
| 168 | } | 168 | } |
| 169 | addr = (unsigned long long) xhci_trb_virt_to_dma(ring->deq_seg, ring->dequeue); | 169 | addr = (unsigned long long) xhci_trb_virt_to_dma(ring->deq_seg, ring->dequeue); |
| 170 | if (ring == xhci->event_ring) | 170 | if (ring == xhci->cmd_ring) |
| 171 | xhci_dbg(xhci, "Event ring deq = 0x%llx (DMA)\n", addr); | ||
| 172 | else if (ring == xhci->cmd_ring) | ||
| 173 | xhci_dbg(xhci, "Command ring deq = 0x%llx (DMA)\n", addr); | 171 | xhci_dbg(xhci, "Command ring deq = 0x%llx (DMA)\n", addr); |
| 174 | else | 172 | else |
| 175 | xhci_dbg(xhci, "Ring deq = 0x%llx (DMA)\n", addr); | 173 | xhci_dbg(xhci, "Ring deq = 0x%llx (DMA)\n", addr); |
| @@ -2267,16 +2265,6 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd) | |||
| 2267 | spin_unlock(&xhci->lock); | 2265 | spin_unlock(&xhci->lock); |
| 2268 | return IRQ_NONE; | 2266 | return IRQ_NONE; |
| 2269 | } | 2267 | } |
| 2270 | xhci_dbg(xhci, "op reg status = %08x\n", status); | ||
| 2271 | xhci_dbg(xhci, "Event ring dequeue ptr:\n"); | ||
| 2272 | xhci_dbg(xhci, "@%llx %08x %08x %08x %08x\n", | ||
| 2273 | (unsigned long long) | ||
| 2274 | xhci_trb_virt_to_dma(xhci->event_ring->deq_seg, trb), | ||
| 2275 | lower_32_bits(le64_to_cpu(trb->link.segment_ptr)), | ||
| 2276 | upper_32_bits(le64_to_cpu(trb->link.segment_ptr)), | ||
| 2277 | (unsigned int) le32_to_cpu(trb->link.intr_target), | ||
| 2278 | (unsigned int) le32_to_cpu(trb->link.control)); | ||
| 2279 | |||
| 2280 | if (status & STS_FATAL) { | 2268 | if (status & STS_FATAL) { |
| 2281 | xhci_warn(xhci, "WARNING: Host System Error\n"); | 2269 | xhci_warn(xhci, "WARNING: Host System Error\n"); |
| 2282 | xhci_halt(xhci); | 2270 | xhci_halt(xhci); |
