diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2013-07-22 20:10:04 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-07-29 13:58:16 +0300 |
| commit | 63c5b4ca7d0daadf11662d6419eb7a1c0ce42eb7 (patch) | |
| tree | 32667855dd4286bd4721045a48451a069a00c6cb /drivers/usb/musb | |
| parent | e9eb2e08d93afc8f334ffe269fc84ea6257ff02c (diff) | |
| download | linux-63c5b4ca7d0daadf11662d6419eb7a1c0ce42eb7.tar.gz | |
usb: musb: do not change dev's dma_mask
Commit 8d2421e ("usb: musb: kill global and static for multi instance")
removed the global dma_mask copy and replaced by parent's DMA mask. The
problem here is that if the parent does not have a dma_mask then
musb_remove() goes kaboom.
Instead trying to fix this I was thinking we do we need to erase
dma_mask in the first place?
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 9b774e72c0e4..80ffd7ee55df 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1843,10 +1843,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) if (use_dma && dev->dma_mask) musb->dma_controller = dma_controller_create(musb, musb->mregs); - /* ideally this would be abstracted in platform setup */ - if (!musb->dma_controller) - dev->dma_mask = NULL; - /* be sure interrupts are disabled before connecting ISR */ musb_platform_disable(musb); musb_generic_disable(musb); @@ -1993,9 +1989,6 @@ static int musb_remove(struct platform_device *pdev) musb_free(musb); device_init_wakeup(dev, 0); -#ifndef CONFIG_MUSB_PIO_ONLY - dma_set_mask(dev, *dev->parent->dma_mask); -#endif return 0; } |