From: 蓝斌元 <lby@rock-chips.com>
Date: Fri, 29 Jun 2012 03:10:30 +0000 (+0800)
Subject: Revert "fix spi driver's bug while dma recieving"
X-Git-Tag: firefly_0821_release~9059
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=301833b9f667281748a6795cbfad770a99b15efb;p=firefly-linux-kernel-4.4.55.git

Revert "fix spi driver's bug while dma recieving"

This reverts commit b01b358f83249ee24bc26232ee3afed5e5e6feec.
---

diff --git a/drivers/spi/rk29_spim.c b/drivers/spi/rk29_spim.c
index d12fbdd6032e..8fca6a804297 100755
--- a/drivers/spi/rk29_spim.c
+++ b/drivers/spi/rk29_spim.c
@@ -133,9 +133,8 @@ void rk29_lcd_spim_spin_unlock(void)
 static void printk_transfer_data(unsigned char *buf, int len)
 {
 	int i = 0;
-	unsigned char *buff = buf;
 	for(i=0; i<len; i++)
-		printk("0x%x,",*buff++);
+		printk("0x%x,",*buf++);
 
 	printk("\n");
 
@@ -1132,7 +1131,7 @@ static void dma_transfer(struct rk29xx_spi *dws)
 		}
 		if (transfer->rx_buf != NULL) {
 			dmacr |= SPI_DMACR_RX_ENABLE;
-			rk29xx_writew(dws, SPIM_DMARDLR, dws->dma_width-1);
+			rk29xx_writew(dws, SPIM_DMARDLR, 0);
 			rk29xx_writew(dws, SPIM_CTRLR1, transfer->len-1);	
 		}
 		rk29xx_writew(dws, SPIM_DMACR, dmacr);
diff --git a/drivers/spi/spi_test.c b/drivers/spi/spi_test.c
index cfba557f7dd2..9c7bc8fbb93e 100755
--- a/drivers/spi/spi_test.c
+++ b/drivers/spi/spi_test.c
@@ -141,7 +141,7 @@ static int __devinit spi_test_probe(struct spi_device *spi)
 
 	g_spi_test_data = spi_test_data;
 
-	printk("%s:bus_num=%d,ok\n",__func__,spi->master->bus_num);
+	printk("%s:bus_num=%d,ok\n",__func__,spi->bus_num);
 
 	return ret;