Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48570711 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

usb: pch_udc: unlock on allocation failure 



There was an unlock missing on the error path.

Also I did a small cleanup by changing ep->dev->lock for just dev->lock.
They're the same lock, but dev->lock is shorter and that's how it is
used for the spin_unlock_irqrestore() call.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9ab7927b

drivers/usb/gadget/pch_udc.c

+5 −3
Original line number Diff line number Diff line
@@ -1608,7 +1608,7 @@ static int pch_udc_pcd_queue(struct usb_ep *usbep, struct usb_request *usbreq, 
		return -EINVAL;

	if (!dev->driver || (dev->gadget.speed == USB_SPEED_UNKNOWN))

		return -ESHUTDOWN;

	spin_lock_irqsave(&ep->dev->lock, iflags);

	spin_lock_irqsave(&dev->lock, iflags);

	/* map the buffer for dma */

	if (usbreq->length &&

	    ((usbreq->dma == DMA_ADDR_INVALID) || !usbreq->dma)) {
@@ -1625,8 +1625,10 @@ static int pch_udc_pcd_queue(struct usb_ep *usbep, struct usb_request *usbreq, 
							     DMA_FROM_DEVICE);

		} else {

			req->buf = kzalloc(usbreq->length, GFP_ATOMIC);

			if (!req->buf)

				return -ENOMEM;

			if (!req->buf) {

				retval = -ENOMEM;

				goto probe_end;

			}

			if (ep->in) {

				memcpy(req->buf, usbreq->buf, usbreq->length);

				req->dma = dma_map_single(&dev->pdev->dev,