ehci-orion.c (e3c55d406bd8df1a878546002c93db90c42be10c) | ehci-orion.c (22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b) |
---|---|
1/* 2 * drivers/usb/host/ehci-orion.c 3 * 4 * Tzachi Perelstein <tzachi@marvell.com> 5 * 6 * This file is licensed under the terms of the GNU General Public 7 * License version 2. This program is licensed "as is" without any 8 * warranty of any kind, whether express or implied. --- 168 unchanged lines hidden (view full) --- 177 178 /* 179 * Right now device-tree probed devices don't get dma_mask 180 * set. Since shared usb code relies on it, set it here for 181 * now. Once we have dma capability bindings this can go away. 182 */ 183 if (!pdev->dev.dma_mask) 184 pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; | 1/* 2 * drivers/usb/host/ehci-orion.c 3 * 4 * Tzachi Perelstein <tzachi@marvell.com> 5 * 6 * This file is licensed under the terms of the GNU General Public 7 * License version 2. This program is licensed "as is" without any 8 * warranty of any kind, whether express or implied. --- 168 unchanged lines hidden (view full) --- 177 178 /* 179 * Right now device-tree probed devices don't get dma_mask 180 * set. Since shared usb code relies on it, set it here for 181 * now. Once we have dma capability bindings this can go away. 182 */ 183 if (!pdev->dev.dma_mask) 184 pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; |
185 if (!pdev->dev.coherent_dma_mask) 186 pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); | 185 err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); 186 if (err) 187 goto err1; |
187 188 if (!request_mem_region(res->start, resource_size(res), 189 ehci_orion_hc_driver.description)) { 190 dev_dbg(&pdev->dev, "controller already in use\n"); 191 err = -EBUSY; 192 goto err1; 193 } 194 --- 137 unchanged lines hidden --- | 188 189 if (!request_mem_region(res->start, resource_size(res), 190 ehci_orion_hc_driver.description)) { 191 dev_dbg(&pdev->dev, "controller already in use\n"); 192 err = -EBUSY; 193 goto err1; 194 } 195 --- 137 unchanged lines hidden --- |