diff options
Diffstat (limited to 'drivers/usb/host/ohci-omap3.c')
-rw-r--r-- | drivers/usb/host/ohci-omap3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c index 408d06a68571..21457417a856 100644 --- a/drivers/usb/host/ohci-omap3.c +++ b/drivers/usb/host/ohci-omap3.c | |||
@@ -65,7 +65,7 @@ static int ohci_hcd_omap3_probe(struct platform_device *pdev) | |||
65 | struct usb_hcd *hcd = NULL; | 65 | struct usb_hcd *hcd = NULL; |
66 | void __iomem *regs = NULL; | 66 | void __iomem *regs = NULL; |
67 | struct resource *res; | 67 | struct resource *res; |
68 | int ret = -ENODEV; | 68 | int ret; |
69 | int irq; | 69 | int irq; |
70 | 70 | ||
71 | if (usb_disabled()) | 71 | if (usb_disabled()) |
@@ -99,11 +99,11 @@ static int ohci_hcd_omap3_probe(struct platform_device *pdev) | |||
99 | * Since shared usb code relies on it, set it here for now. | 99 | * Since shared usb code relies on it, set it here for now. |
100 | * Once we have dma capability bindings this can go away. | 100 | * Once we have dma capability bindings this can go away. |
101 | */ | 101 | */ |
102 | if (!dev->dma_mask) | 102 | ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32)); |
103 | dev->dma_mask = &dev->coherent_dma_mask; | 103 | if (ret) |
104 | if (!dev->coherent_dma_mask) | 104 | goto err_io; |
105 | dev->coherent_dma_mask = DMA_BIT_MASK(32); | ||
106 | 105 | ||
106 | ret = -ENODEV; | ||
107 | hcd = usb_create_hcd(&ohci_omap3_hc_driver, dev, | 107 | hcd = usb_create_hcd(&ohci_omap3_hc_driver, dev, |
108 | dev_name(dev)); | 108 | dev_name(dev)); |
109 | if (!hcd) { | 109 | if (!hcd) { |