Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac140a8f authored by Andrea Paterniani's avatar Andrea Paterniani Committed by Linus Torvalds
Browse files

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: default avatarAndrea Paterniani <a.paterniani@swapp-eng.it>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b11115c1

drivers/spi/spi_imx.c

+2 −1
Original line number Diff line number Diff line
@@ -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);