aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_imx.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index bd0729b6b6ed..54ac7bea5f8c 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1538,24 +1538,24 @@ static int __init spi_imx_probe(struct platform_device *pdev)
1538 drv_data->rx_channel = -1; 1538 drv_data->rx_channel = -1;
1539 if (platform_info->enable_dma) { 1539 if (platform_info->enable_dma) {
1540 /* Get rx DMA channel */ 1540 /* Get rx DMA channel */
1541 status = imx_dma_request_by_prio(&drv_data->rx_channel, 1541 drv_data->rx_channel = imx_dma_request_by_prio("spi_imx_rx",
1542 "spi_imx_rx", DMA_PRIO_HIGH); 1542 DMA_PRIO_HIGH);
1543 if (status < 0) { 1543 if (drv_data->rx_channel < 0) {
1544 dev_err(dev, 1544 dev_err(dev,
1545 "probe - problem (%d) requesting rx channel\n", 1545 "probe - problem (%d) requesting rx channel\n",
1546 status); 1546 drv_data->rx_channel);
1547 goto err_no_rxdma; 1547 goto err_no_rxdma;
1548 } else 1548 } else
1549 imx_dma_setup_handlers(drv_data->rx_channel, NULL, 1549 imx_dma_setup_handlers(drv_data->rx_channel, NULL,
1550 dma_err_handler, drv_data); 1550 dma_err_handler, drv_data);
1551 1551
1552 /* Get tx DMA channel */ 1552 /* Get tx DMA channel */
1553 status = imx_dma_request_by_prio(&drv_data->tx_channel, 1553 drv_data->tx_channel = imx_dma_request_by_prio("spi_imx_tx",
1554 "spi_imx_tx", DMA_PRIO_MEDIUM); 1554 DMA_PRIO_MEDIUM);
1555 if (status < 0) { 1555 if (drv_data->tx_channel < 0) {
1556 dev_err(dev, 1556 dev_err(dev,
1557 "probe - problem (%d) requesting tx channel\n", 1557 "probe - problem (%d) requesting tx channel\n",
1558 status); 1558 drv_data->tx_channel);
1559 imx_dma_free(drv_data->rx_channel); 1559 imx_dma_free(drv_data->rx_channel);
1560 goto err_no_txdma; 1560 goto err_no_txdma;
1561 } else 1561 } else