diff options
| author | Russ Gorby <russ.gorby@intel.com> | 2011-02-07 12:02:28 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 11:16:14 -0800 |
| commit | 5fc324952049b2e6d16a54ef89afee25611ca476 (patch) | |
| tree | 8adffe2509388c7a999c28906e3594e0e79fb11d /drivers/tty/serial/ifx6x60.c | |
| parent | b68f23b24e0013d489aaa986da0210feea00d4c1 (diff) | |
| download | blackbird-op-linux-5fc324952049b2e6d16a54ef89afee25611ca476.tar.gz blackbird-op-linux-5fc324952049b2e6d16a54ef89afee25611ca476.zip | |
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/serial/ifx6x60.c')
| -rw-r--r-- | drivers/tty/serial/ifx6x60.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c index 972c04d8c1a3..bb2ff206d0ab 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) ifx_dev->spi_slave_cts = 0; /*initialize transfer and dma buffers */ - ifx_dev->tx_buffer = dma_alloc_coherent(&ifx_dev->spi_dev->dev, + ifx_dev->tx_buffer = dma_alloc_coherent(ifx_dev->spi_dev->dev.parent, IFX_SPI_TRANSFER_SIZE, &ifx_dev->tx_bus, GFP_KERNEL); @@ -1007,7 +1007,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi) ret = -ENOMEM; goto error_ret; } - ifx_dev->rx_buffer = dma_alloc_coherent(&ifx_dev->spi_dev->dev, + ifx_dev->rx_buffer = dma_alloc_coherent(ifx_dev->spi_dev->dev.parent, IFX_SPI_TRANSFER_SIZE, &ifx_dev->rx_bus, GFP_KERNEL); |
