From 106bb488b6850f73ee66481723793effaaa3324e Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Mon, 17 May 2010 13:17:10 +0000 Subject: [PATCH] --- yaml --- r: 198402 b: refs/heads/master c: 338ff2982d969a8e09ca356552cb5022ad380766 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_mpc8xxx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fa88a050a7a8..3a1d96935072 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0398fb70940e1f10939d6126eafb760bd48d1566 +refs/heads/master: 338ff2982d969a8e09ca356552cb5022ad380766 diff --git a/trunk/drivers/spi/spi_mpc8xxx.c b/trunk/drivers/spi/spi_mpc8xxx.c index 66517ce750f3..6e7aabe8db18 100644 --- a/trunk/drivers/spi/spi_mpc8xxx.c +++ b/trunk/drivers/spi/spi_mpc8xxx.c @@ -515,7 +515,7 @@ static void mpc8xxx_spi_cpm_bufs_complete(struct mpc8xxx_spi *mspi) if (mspi->map_tx_dma) dma_unmap_single(dev, mspi->tx_dma, t->len, DMA_TO_DEVICE); - if (mspi->map_tx_dma) + if (mspi->map_rx_dma) dma_unmap_single(dev, mspi->rx_dma, t->len, DMA_FROM_DEVICE); mspi->xfer_in_progress = NULL; }