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
usb: gadget: udc: atmel: change setting for DMA
[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
..
0834712
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
@@
-1875,12
+1875,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;
}