Skip to content

Commit

Permalink
serial: ifx6x60: dma_alloc_coherent must use parent dev
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russ Gorby authored and Greg Kroah-Hartman committed Feb 17, 2011
1 parent b68f23b commit 5fc3249
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/tty/serial/ifx6x60.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 5fc3249

Please sign in to comment.