git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gadgetfs: Fix leak on error in aio_read()
[pandora-kernel.git]
/
drivers
/
usb
/
gadget
/
atmel_usba_udc.c
diff --git
a/drivers/usb/gadget/atmel_usba_udc.c
b/drivers/usb/gadget/atmel_usba_udc.c
index
271a9d8
..
9ba3114
100644
(file)
--- a/
drivers/usb/gadget/atmel_usba_udc.c
+++ b/
drivers/usb/gadget/atmel_usba_udc.c
@@
-739,10
+739,10
@@
static int queue_dma(struct usba_udc *udc, struct usba_ep *ep,
req->ctrl = USBA_BF(DMA_BUF_LEN, req->req.length)
| USBA_DMA_CH_EN | USBA_DMA_END_BUF_IE
req->ctrl = USBA_BF(DMA_BUF_LEN, req->req.length)
| USBA_DMA_CH_EN | USBA_DMA_END_BUF_IE
- | USBA_DMA_END_
TR_EN | USBA_DMA_END_TR_IE
;
+ | USBA_DMA_END_
BUF_EN
;
- if (ep->is_in)
- req->ctrl |= USBA_DMA_END_
BUF_EN
;
+ if (
!
ep->is_in)
+ req->ctrl |= USBA_DMA_END_
TR_EN | USBA_DMA_END_TR_IE
;
/*
* Add this request to the queue and submit for DMA if
/*
* Add this request to the queue and submit for DMA if
@@
-850,7
+850,7
@@
static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
{
struct usba_ep *ep = to_usba_ep(_ep);
struct usba_udc *udc = ep->udc;
{
struct usba_ep *ep = to_usba_ep(_ep);
struct usba_udc *udc = ep->udc;
- struct usba_request *req
= to_usba_req(_req)
;
+ struct usba_request *req;
unsigned long flags;
u32 status;
unsigned long flags;
u32 status;
@@
-859,6
+859,16
@@
static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
spin_lock_irqsave(&udc->lock, flags);
spin_lock_irqsave(&udc->lock, flags);
+ list_for_each_entry(req, &ep->queue, queue) {
+ if (&req->req == _req)
+ break;
+ }
+
+ if (&req->req != _req) {
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return -EINVAL;
+ }
+
if (req->using_dma) {
/*
* If this request is currently being transferred,
if (req->using_dma) {
/*
* If this request is currently being transferred,
@@
-1597,7
+1607,6
@@
static void usba_ep_irq(struct usba_udc *udc, struct usba_ep *ep)
if ((epstatus & epctrl) & USBA_RX_BK_RDY) {
DBG(DBG_BUS, "%s: RX data ready\n", ep->ep.name);
receive_data(ep);
if ((epstatus & epctrl) & USBA_RX_BK_RDY) {
DBG(DBG_BUS, "%s: RX data ready\n", ep->ep.name);
receive_data(ep);
- usba_ep_writel(ep, CLR_STA, USBA_RX_BK_RDY);
}
}
}
}
@@
-1875,12
+1884,13
@@
static int atmel_usba_stop(struct usb_gadget_driver *driver)
driver->unbind(&udc->gadget);
udc->gadget.dev.driver = NULL;
driver->unbind(&udc->gadget);
udc->gadget.dev.driver = NULL;
- udc->driver = NULL;
clk_disable(udc->hclk);
clk_disable(udc->pclk);
clk_disable(udc->hclk);
clk_disable(udc->pclk);
- DBG(DBG_GADGET, "unregistered driver `%s'\n", driver->driver.name);
+ DBG(DBG_GADGET, "unregistered driver `%s'\n", udc->driver->driver.name);
+
+ udc->driver = NULL;
return 0;
}
return 0;
}