summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-03-08 15:47:19 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-03-08 15:47:19 -0800
commitb4659fbb0d89b809c96ea4600a8df95390f72baf (patch)
treeaf1568279b2b2a73f5abc70101ee7e9923da5c3f
parentb8db96118b05e2a42c5108c338448eb1fddc78bd (diff)
parent59b6f2084388cc4c76c9738d7068e18099d8bfe7 (diff)
Merge "USB: composite: Fix double release of spin_unlock_irqsave"
-rw-r--r--drivers/usb/gadget/composite.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 9622514e3df9..9d795489c285 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -2470,6 +2470,7 @@ void usb_composite_setup_continue(struct usb_composite_dev *cdev)
}
spin_unlock_irqrestore(&cdev->lock, flags);
WARN(cdev, "%s: Unexpected call\n", __func__);
+ return;
} else if (--cdev->delayed_status == 0) {
DBG(cdev, "%s: Completing delayed status\n", __func__);