usb: musb: unmap reqs in musb_gadget_queue()'s error case (23a53d90) · Commits · 戴 / test

If the descriptor is missing the reqeust is never unmapped. This patch changes this and renames the cleanup label to unlock since there is no cleanup done. The cleanup would revert the allocation of ressource (i.e. this dma mapping) but it does not, it simply unlocks and returns. Signed-off-by:

Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by:

Felipe Balbi <balbi@ti.com>

drivers/usb/musb/musb_gadget.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1266,7 +1266,8 @@ static int musb_gadget_queue(struct usb_ep ep, struct usb_request req,
		dev_dbg(musb->controller, "req %p queued to %s while ep %s\n",
		req, ep->name, "disabled");
		status = -ESHUTDOWN;
		goto cleanup;
		unmap_dma_buffer(request, musb);
		goto unlock;
		}

		/* add request to the list */
		@@ -1276,7 +1277,7 @@ static int musb_gadget_queue(struct usb_ep ep, struct usb_request req,
		if (!musb_ep->busy && &request->list == musb_ep->req_list.next)
		musb_ep_restart(musb, request);

		cleanup:
		unlock:
		spin_unlock_irqrestore(&musb->lock, lockflags);
		return status;
		}

Admin message