diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-14 01:32:07 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-14 01:33:52 +0400 |
| commit | 86a45a023dc4e2217bef34ab204b21a37d1b373a (patch) | |
| tree | 24e6f702e2b82a1c75c7e830099a895d7b60dcfc /drivers/usb/musb/ux500.c | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
| parent | 132543074af3cf1e94e3608abf162880edbdcbb3 (diff) | |
| download | linux-86a45a023dc4e2217bef34ab204b21a37d1b373a.tar.xz | |
Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus
* 'for-greg' of git://gitorious.org/usb/usb:
USB: musb: blackfin: work around anomaly 05000450
usb: musb: Fix the crash issue during reboot
usb: musb: gadget: check the correct list_head
usb: musb: temporarily make it bool
USB: musb: dereferencing an iomem pointer
USB: musb: silence printk format warning
USB: musb: using 0 instead of NULL
USB: musb: add missing unlock in cppi_interrupt()
usb: musb: ux500: copy dma mask from platform device to musb device
usb: musb: clear AUTOSET while clearing DMAENAB
Diffstat (limited to 'drivers/usb/musb/ux500.c')
| -rw-r--r-- | drivers/usb/musb/ux500.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c index d6384e4aeef9..f7e04bf34a13 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c @@ -93,6 +93,8 @@ static int __init ux500_probe(struct platform_device *pdev) } musb->dev.parent = &pdev->dev; + musb->dev.dma_mask = pdev->dev.dma_mask; + musb->dev.coherent_dma_mask = pdev->dev.coherent_dma_mask; glue->dev = &pdev->dev; glue->musb = musb; |