Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 343642
b: refs/heads/master
c: 6a47d80
h: refs/heads/master
v: v3
  • Loading branch information
Shubhrajyoti D authored and Mark Brown committed Dec 2, 2012
1 parent 6251173 commit f774d66
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 170c2d0a87922adb43a8e8ca47cba3e30407d4d6
refs/heads/master: 6a47d80308a824c32c47fbef6b8e8b59de08af94
3 changes: 0 additions & 3 deletions trunk/drivers/spi/spi-omap2-mcspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f774d66

Please sign in to comment.