aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorRuss Gorby <russ.gorby@intel.com>2011-02-07 15:02:28 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 14:16:14 -0500
commit5fc324952049b2e6d16a54ef89afee25611ca476 (patch)
tree8adffe2509388c7a999c28906e3594e0e79fb11d /drivers/tty
parentb68f23b24e0013d489aaa986da0210feea00d4c1 (diff)
serial: ifx6x60: dma_alloc_coherent must use parent dev
This driver is a SPI protocol driver and has no DMA ops associated with the device so the call will fail. Furthermore, the DMA allocation made here will be used by the SPI controller driver (parent dev) so it makes sense to pass that device instead. Signed-off-by: Russ Gorby <russ.gorby@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/ifx6x60.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 972c04d8c1a..bb2ff206d0a 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -998,7 +998,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
998 ifx_dev->spi_slave_cts = 0; 998 ifx_dev->spi_slave_cts = 0;
999 999
1000 /*initialize transfer and dma buffers */ 1000 /*initialize transfer and dma buffers */
1001 ifx_dev->tx_buffer = dma_alloc_coherent(&ifx_dev->spi_dev->dev, 1001 ifx_dev->tx_buffer = dma_alloc_coherent(ifx_dev->spi_dev->dev.parent,
1002 IFX_SPI_TRANSFER_SIZE, 1002 IFX_SPI_TRANSFER_SIZE,
1003 &ifx_dev->tx_bus, 1003 &ifx_dev->tx_bus,
1004 GFP_KERNEL); 1004 GFP_KERNEL);
@@ -1007,7 +1007,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
1007 ret = -ENOMEM; 1007 ret = -ENOMEM;
1008 goto error_ret; 1008 goto error_ret;
1009 } 1009 }
1010 ifx_dev->rx_buffer = dma_alloc_coherent(&ifx_dev->spi_dev->dev, 1010 ifx_dev->rx_buffer = dma_alloc_coherent(ifx_dev->spi_dev->dev.parent,
1011 IFX_SPI_TRANSFER_SIZE, 1011 IFX_SPI_TRANSFER_SIZE,
1012 &ifx_dev->rx_bus, 1012 &ifx_dev->rx_bus,
1013 GFP_KERNEL); 1013 GFP_KERNEL);