Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszere...

[cascardo/linux.git] / drivers / usb / host / xhci-ring.c

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index e692e76..88da8d6 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -299,7 +299,7 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci)
         * seconds), then it should assume that the there are
         * larger problems with the xHC and assert HCRST.
         */
-       ret = xhci_handshake(xhci, &xhci->op_regs->cmd_ring,
+       ret = xhci_handshake(&xhci->op_regs->cmd_ring,
                        CMD_RING_RUNNING, 0, 5 * 1000 * 1000);
        if (ret < 0) {
                xhci_err(xhci, "Stopped the command ring failed, "
@@ -609,7 +609,7 @@ static void xhci_giveback_urb_in_irq(struct xhci_hcd *xhci,
 
                spin_unlock(&xhci->lock);
                usb_hcd_giveback_urb(hcd, urb, status);
-               xhci_urb_free_priv(xhci, urb_priv);
+               xhci_urb_free_priv(urb_priv);
                spin_lock(&xhci->lock);
        }
 }
@@ -1110,7 +1110,7 @@ static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id,
         * is not waiting on the configure endpoint command.
         */
        virt_dev = xhci->devs[slot_id];
-       ctrl_ctx = xhci_get_input_control_ctx(xhci, virt_dev->in_ctx);
+       ctrl_ctx = xhci_get_input_control_ctx(virt_dev->in_ctx);
        if (!ctrl_ctx) {
                xhci_warn(xhci, "Could not get input context, bad type.\n");
                return;
@@ -2354,8 +2354,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                        status = 0;
                        break;
                }
-               xhci_warn(xhci, "ERROR Unknown event condition, HC probably "
-                               "busted\n");
+               xhci_warn(xhci, "ERROR Unknown event condition %u, HC probably busted\n",
+                         trb_comp_code);
                goto cleanup;
        }
 
@@ -2497,7 +2497,7 @@ cleanup:
                        urb = td->urb;
                        urb_priv = urb->hcpriv;
 
-                       xhci_urb_free_priv(xhci, urb_priv);
+                       xhci_urb_free_priv(urb_priv);
 
                        usb_hcd_unlink_urb_from_ep(bus_to_hcd(urb->dev->bus), urb);
                        if ((urb->actual_length != urb->transfer_buffer_length &&