From 5a7d71e6e167f5cdb1a023da4a4129d40974c78c Mon Sep 17 00:00:00 2001 From: Jassi Brar Date: Fri, 3 Sep 2010 10:36:26 +0900 Subject: [PATCH] --- yaml --- r: 210631 b: refs/heads/master c: 251ee478f2c877a9a80362e094c542fbac7f5651 h: refs/heads/master i: 210629: 00796d15b866093d3b9432f74b953bc048db5224 210627: 6f9fae5d5e65e83abb098d8e0cf77af713f65b1b 210623: 5b2c273c29a22eca944e51b894ae3dce91416e8d v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_s3c64xx.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6437c33daecb..7aa810ecc4da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3e55ff5854655d8723ad8b307f02515aecc3df5 +refs/heads/master: 251ee478f2c877a9a80362e094c542fbac7f5651 diff --git a/trunk/drivers/spi/spi_s3c64xx.c b/trunk/drivers/spi/spi_s3c64xx.c index 8130f02dc466..240b690a8a6f 100644 --- a/trunk/drivers/spi/spi_s3c64xx.c +++ b/trunk/drivers/spi/spi_s3c64xx.c @@ -508,8 +508,9 @@ static int s3c64xx_spi_map_mssg(struct s3c64xx_spi_driver_data *sdd, list_for_each_entry(xfer, &msg->transfers, transfer_list) { if (xfer->tx_buf != NULL) { - xfer->tx_dma = dma_map_single(dev, xfer->tx_buf, - xfer->len, DMA_TO_DEVICE); + xfer->tx_dma = dma_map_single(dev, + (void *)xfer->tx_buf, xfer->len, + DMA_TO_DEVICE); if (dma_mapping_error(dev, xfer->tx_dma)) { dev_err(dev, "dma_map_single Tx failed\n"); xfer->tx_dma = XFER_DMAADDR_INVALID;