diff options
Diffstat (limited to 'drivers/usb/host/isp1362-hcd.c')
-rw-r--r-- | drivers/usb/host/isp1362-hcd.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c index 42971657fde2..217fb5170200 100644 --- a/drivers/usb/host/isp1362-hcd.c +++ b/drivers/usb/host/isp1362-hcd.c | |||
@@ -1257,7 +1257,7 @@ static int isp1362_urb_enqueue(struct usb_hcd *hcd, | |||
1257 | 1257 | ||
1258 | /* avoid all allocations within spinlocks: request or endpoint */ | 1258 | /* avoid all allocations within spinlocks: request or endpoint */ |
1259 | if (!hep->hcpriv) { | 1259 | if (!hep->hcpriv) { |
1260 | ep = kcalloc(1, sizeof *ep, mem_flags); | 1260 | ep = kzalloc(sizeof *ep, mem_flags); |
1261 | if (!ep) | 1261 | if (!ep) |
1262 | return -ENOMEM; | 1262 | return -ENOMEM; |
1263 | } | 1263 | } |
@@ -2719,24 +2719,11 @@ static int __init isp1362_probe(struct platform_device *pdev) | |||
2719 | } | 2719 | } |
2720 | irq = irq_res->start; | 2720 | irq = irq_res->start; |
2721 | 2721 | ||
2722 | #ifdef CONFIG_USB_HCD_DMA | ||
2723 | if (pdev->dev.dma_mask) { | ||
2724 | struct resource *dma_res = platform_get_resource(pdev, IORESOURCE_MEM, 2); | ||
2725 | |||
2726 | if (!dma_res) { | ||
2727 | retval = -ENODEV; | ||
2728 | goto err1; | ||
2729 | } | ||
2730 | isp1362_hcd->data_dma = dma_res->start; | ||
2731 | isp1362_hcd->max_dma_size = resource_len(dma_res); | ||
2732 | } | ||
2733 | #else | ||
2734 | if (pdev->dev.dma_mask) { | 2722 | if (pdev->dev.dma_mask) { |
2735 | DBG(1, "won't do DMA"); | 2723 | DBG(1, "won't do DMA"); |
2736 | retval = -ENODEV; | 2724 | retval = -ENODEV; |
2737 | goto err1; | 2725 | goto err1; |
2738 | } | 2726 | } |
2739 | #endif | ||
2740 | 2727 | ||
2741 | if (!request_mem_region(addr->start, resource_len(addr), hcd_name)) { | 2728 | if (!request_mem_region(addr->start, resource_len(addr), hcd_name)) { |
2742 | retval = -EBUSY; | 2729 | retval = -EBUSY; |