---

yaml --- r: 185232 b: refs/heads/master c: c01591b h: refs/heads/master v: v3
git-mirror · Mar 2, 2010 · a576433 · a576433
1 parent 8e0237a
commit a576433
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f661c6f8c67bd55e93348f160d590ff9edf08904
+refs/heads/master: c01591bd6ece72e1c099cbc25ed812e1add579dc
diff --git a/trunk/drivers/usb/host/xhci-hcd.c b/trunk/drivers/usb/host/xhci-hcd.c
@@ -1181,6 +1181,8 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
 		ret = xhci_queue_evaluate_context(xhci, in_ctx->dma,
 				udev->slot_id);
 	if (ret < 0) {
+		if (command)
+			list_del(&command->cmd_list);
 		spin_unlock_irqrestore(&xhci->lock, flags);
 		xhci_dbg(xhci, "FIXME allocate a new ring segment\n");
 		return -ENOMEM;