uhci-platform.c (22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b) uhci-platform.c (e1fd7341837238c6c5380c5073887d238f706cf0)
1/*
2 * Generic UHCI HCD (Host Controller Driver) for Platform Devices
3 *
4 * Copyright (c) 2011 Tony Prisk <linux@prisktech.co.nz>
5 *
6 * This file is based on uhci-grlib.c
7 * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu
8 */

--- 61 unchanged lines hidden (view full) ---

70 if (usb_disabled())
71 return -ENODEV;
72
73 /*
74 * Right now device-tree probed devices don't get dma_mask set.
75 * Since shared usb code relies on it, set it here for now.
76 * Once we have dma capability bindings this can go away.
77 */
1/*
2 * Generic UHCI HCD (Host Controller Driver) for Platform Devices
3 *
4 * Copyright (c) 2011 Tony Prisk <linux@prisktech.co.nz>
5 *
6 * This file is based on uhci-grlib.c
7 * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu
8 */

--- 61 unchanged lines hidden (view full) ---

70 if (usb_disabled())
71 return -ENODEV;
72
73 /*
74 * Right now device-tree probed devices don't get dma_mask set.
75 * Since shared usb code relies on it, set it here for now.
76 * Once we have dma capability bindings this can go away.
77 */
78 if (!pdev->dev.dma_mask)
79 pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
80 ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
78 ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
81 if (ret)
82 return ret;
83
84 hcd = usb_create_hcd(&uhci_platform_hc_driver, &pdev->dev,
85 pdev->name);
86 if (!hcd)
87 return -ENOMEM;
88

--- 78 unchanged lines hidden --- 		79 if (ret)
80 return ret;
81
82 hcd = usb_create_hcd(&uhci_platform_hc_driver, &pdev->dev,
83 pdev->name);
84 if (!hcd)
85 return -ENOMEM;
86

--- 78 unchanged lines hidden ---