musb_hdrc: Trivial DMA fixes after recent update

Trivial DMA fixes after recent update

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 9456608d5ca38ff5453d3edefd3f0889cf20edb0..8158169481456f103ff16f05b864627e670e773d 100644 (file)
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -128,7 +128,7 @@ __acquires(ep->musb->Lock)
                                                : DMA_FROM_DEVICE);
                        req->request.dma = DMA_ADDR_INVALID;
                        req->mapped = 0;
-               } else
+               } else if (req->request.dma != DMA_ADDR_INVALID)
                        dma_sync_single_for_cpu(musb->controller,
                                        req->request.dma,
                                        req->request.length,

diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index 4d5cf148c70026ff92c1db39e62baac92180ce88..31a513531fec732740dc1c7af67e0d8fd1e73fc4 100644 (file)
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -1857,6 +1857,7 @@ static int __devinit musb_probe(struct platform_device *pdev)
 
 static int __devexit musb_remove(struct platform_device *pdev)
 {
+       struct device   *dev = &pdev->dev;
        struct musb     *musb = dev_to_musb(&pdev->dev);
        void __iomem    *ctrl_base = musb->ctrl_base;