summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorAndrea Paterniani <a.paterniani@swapp-eng.it>2007-06-01 00:47:07 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-01 08:18:30 -0700
commitac140a8f8396504b33ddafb7309feca77bff8497 (patch)
tree609b2ad3b02c3012ced92405d78945196245a0cd /drivers/spi
parentb11115c15351faba978ce1b9e75068e77f6ef48d (diff)
SPI: Freescale iMX SPI controller driver fixes
Fix 2 bugs: - SPI_DMA_RHDMA bad value. - Missing return value in setup() function (lost passing from patch-2.6.20-rc4-spi_imx to patch-2.6.20-rc6-spi_imx). Signed-off-by: Andrea Paterniani <a.paterniani@swapp-eng.it> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_imx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 51daa212c6b..656be4a5094 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -121,7 +121,7 @@
32.768 KHz Clock */
/* SPI DMA Register Bit Fields & Masks */
-#define SPI_DMA_RHDMA (0xF << 4) /* RXFIFO Half Status */
+#define SPI_DMA_RHDMA (0x1 << 4) /* RXFIFO Half Status */
#define SPI_DMA_RFDMA (0x1 << 5) /* RXFIFO Full Status */
#define SPI_DMA_TEDMA (0x1 << 6) /* TXFIFO Empty Status */
#define SPI_DMA_THDMA (0x1 << 7) /* TXFIFO Half Status */
@@ -1355,6 +1355,7 @@ static int setup(struct spi_device *spi)
spi->bits_per_word,
spi_speed_hz(SPI_CONTROL_DATARATE_MIN),
spi->max_speed_hz);
+ return status;
err_first_setup:
kfree(chip);