diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-11 13:56:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-11 13:56:29 -0700 |
| commit | 1cd572fc0c5f6887ea0542e2d3ec26625e2cdfb7 (patch) | |
| tree | 9b987397f34f685edbb4b1f282a32d229c15a1bd /drivers/usb/musb/cppi_dma.c | |
| parent | e6d49d093e1076df060c18d28b8ebc36077f76e7 (diff) | |
| parent | d8c3ef256f88b7c6ecd673d03073b5645be9c5e4 (diff) | |
| download | blackbird-op-linux-1cd572fc0c5f6887ea0542e2d3ec26625e2cdfb7.tar.gz blackbird-op-linux-1cd572fc0c5f6887ea0542e2d3ec26625e2cdfb7.zip | |
Merge tag 'musb-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
usb: musb: patches for v3.7 merge window
Here we have a bunch of miscellaneous cleanups and fixes
to the musb driver. It fixes a bunch of mistakes errors
which nobody has triggered before, so I'm not Ccing stable
tree.
We are finally improving OMAP's VBUS/ID Mailbox usage so
that we can introduce our PHY drivers properly. Also, we're
adding support for multiple instances of the MUSB IP in
the same SoC, as seen on some platforms from TI which
have 2 MUSB instances.
Other than that, we have some small fixes like not kicking
DMA for a zero byte transfer, or properly handling NAK timeout
on MUSB's host side, and the enabling of DMA Mode1 for any
transfers which are aligned to wMaxPacketSize.
All patches have been pending on mailing list for a long time
and I don't expect any big surprises with this pull request.
Diffstat (limited to 'drivers/usb/musb/cppi_dma.c')
| -rw-r--r-- | drivers/usb/musb/cppi_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index 8637c1f69fc3..e19da82b4782 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c @@ -1316,7 +1316,7 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id) } /* Instantiate a software object representing a DMA controller. */ -struct dma_controller *__init +struct dma_controller *__devinit dma_controller_create(struct musb *musb, void __iomem *mregs) { struct cppi *controller; |
