[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1294272313-15899-3-git-send-email-russ.gorby@intel.com>
Date: Wed, 5 Jan 2011 16:05:08 -0800
From: Russ Gorby <russ.gorby@...el.com>
To: Greg@...r.kernel.org, Kroah-Hartman@...r.kernel.org,
<gregkh@...e.de>, Vasiliy@...r.kernel.org, Kulikov@...r.kernel.org,
<segoon@...nwall.com>, Alan@...r.kernel.org, Cox@...r.kernel.org,
<alan@...ux.intel.com>, Russ@...r.kernel.org,
Gorby@...r.kernel.org, <richardx.r.gorby@...el.com>,
linux-kernel@...r.kernel.org
Cc: suhail.ahmed@...el.com
Subject: [PATCH 2/7] 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@...el.com>
---
drivers/serial/ifx6x60.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/serial/ifx6x60.c b/drivers/serial/ifx6x60.c
index 1eb44f9..e18ae38 100644
--- a/drivers/serial/ifx6x60.c
+++ b/drivers/serial/ifx6x60.c
@@ -990,7 +990,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);
@@ -999,7 +999,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);
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists