diff options
| -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 | ||