From f774d66077a7906f12852dacd80a81acda0a7a81 Mon Sep 17 00:00:00 2001 From: Shubhrajyoti D Date: Mon, 19 Nov 2012 12:12:29 +0530 Subject: [PATCH] --- yaml --- r: 343642 b: refs/heads/master c: 6a47d80308a824c32c47fbef6b8e8b59de08af94 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-omap2-mcspi.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 40111dce8b64..f28c61d207d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 170c2d0a87922adb43a8e8ca47cba3e30407d4d6 +refs/heads/master: 6a47d80308a824c32c47fbef6b8e8b59de08af94 diff --git a/trunk/drivers/spi/spi-omap2-mcspi.c b/trunk/drivers/spi/spi-omap2-mcspi.c index cc4f2dd89b50..d1895f700196 100644 --- a/trunk/drivers/spi/spi-omap2-mcspi.c +++ b/trunk/drivers/spi/spi-omap2-mcspi.c @@ -324,14 +324,11 @@ static void omap2_mcspi_tx_dma(struct spi_device *spi, struct omap2_mcspi *mcspi; struct omap2_mcspi_dma *mcspi_dma; unsigned int count; - const u8 * tx; mcspi = spi_master_get_devdata(spi->master); mcspi_dma = &mcspi->dma_channels[spi->chip_select]; count = xfer->len; - tx = xfer->tx_buf; - if (mcspi_dma->dma_tx) { struct dma_async_tx_descriptor *tx; struct scatterlist sg;