diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2013-07-22 14:10:04 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-07-29 06:58:16 -0400 |
commit | 63c5b4ca7d0daadf11662d6419eb7a1c0ce42eb7 (patch) | |
tree | 32667855dd4286bd4721045a48451a069a00c6cb | |
parent | e9eb2e08d93afc8f334ffe269fc84ea6257ff02c (diff) |
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>
-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) | |||
1843 | if (use_dma && dev->dma_mask) | 1843 | if (use_dma && dev->dma_mask) |
1844 | musb->dma_controller = dma_controller_create(musb, musb->mregs); | 1844 | musb->dma_controller = dma_controller_create(musb, musb->mregs); |
1845 | 1845 | ||
1846 | /* ideally this would be abstracted in platform setup */ | ||
1847 | if (!musb->dma_controller) | ||
1848 | dev->dma_mask = NULL; | ||
1849 | |||
1850 | /* be sure interrupts are disabled before connecting ISR */ | 1846 | /* be sure interrupts are disabled before connecting ISR */ |
1851 | musb_platform_disable(musb); | 1847 | musb_platform_disable(musb); |
1852 | musb_generic_disable(musb); | 1848 | musb_generic_disable(musb); |
@@ -1993,9 +1989,6 @@ static int musb_remove(struct platform_device *pdev) | |||
1993 | 1989 | ||
1994 | musb_free(musb); | 1990 | musb_free(musb); |
1995 | device_init_wakeup(dev, 0); | 1991 | device_init_wakeup(dev, 0); |
1996 | #ifndef CONFIG_MUSB_PIO_ONLY | ||
1997 | dma_set_mask(dev, *dev->parent->dma_mask); | ||
1998 | #endif | ||
1999 | return 0; | 1992 | return 0; |
2000 | } | 1993 | } |
2001 | 1994 | ||