]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
xhci: Add missing unlocks on error paths
authorEmil Goode <emilgoode@gmail.com>
Tue, 25 Jun 2013 22:49:36 +0000 (15:49 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 25 Jun 2013 23:41:06 +0000 (16:41 -0700)
This patch adds missing unlocks on error paths in the
xhci_free_streams and xhci_configure_endpoint functions.

Signed-off-by: Emil Goode <emilgoode@gmail.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci.c

index 6779c926e3b027f4ac25e9aa1abfbc37246dc3b5..2c49f00260ca2ad9cd0e79bb3078dbd25bb864d6 100644 (file)
@@ -2603,6 +2603,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
                in_ctx = virt_dev->in_ctx;
        ctrl_ctx = xhci_get_input_control_ctx(xhci, in_ctx);
        if (!ctrl_ctx) {
+               spin_unlock_irqrestore(&xhci->lock, flags);
                xhci_warn(xhci, "%s: Could not get input context, bad type.\n",
                                __func__);
                return -ENOMEM;
@@ -3298,6 +3299,7 @@ int xhci_free_streams(struct usb_hcd *hcd, struct usb_device *udev,
        command = vdev->eps[ep_index].stream_info->free_streams_command;
        ctrl_ctx = xhci_get_input_control_ctx(xhci, command->in_ctx);
        if (!ctrl_ctx) {
+               spin_unlock_irqrestore(&xhci->lock, flags);
                xhci_warn(xhci, "%s: Could not get input context, bad type.\n",
                                __func__);
                return -EINVAL;