diff options
author | David Brownell <david-b@pacbell.net> | 2007-07-17 07:04:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:04 -0400 |
commit | dccd573bb02aa011a4a7146c02c409ac0bd722a0 (patch) | |
tree | 743eeca4fbbea8272ca4f341b806d776e404d704 /drivers/spi/spi_s3c24xx.c | |
parent | ff294cba8a62fa8334b88692da6d48683900f015 (diff) |
SPI controller drivers: check for unsupported modes
Minor SPI controller driver updates: make the setup() methods reject
spi->mode bits they don't support, by masking aginst the inverse of bits
they *do* support. This insures against misbehavior later when new mode
bits get added.
Most controllers can't support SPI_LSB_FIRST; more handle SPI_CS_HIGH.
Support for all four SPI clock/transfer modes is routine.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi/spi_s3c24xx.c')
-rw-r--r-- | drivers/spi/spi_s3c24xx.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index d5a710f6e445..7071ff8da63e 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
@@ -146,6 +146,9 @@ static int s3c24xx_spi_setupxfer(struct spi_device *spi, | |||
146 | return 0; | 146 | return 0; |
147 | } | 147 | } |
148 | 148 | ||
149 | /* the spi->mode bits understood by this driver: */ | ||
150 | #define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH) | ||
151 | |||
149 | static int s3c24xx_spi_setup(struct spi_device *spi) | 152 | static int s3c24xx_spi_setup(struct spi_device *spi) |
150 | { | 153 | { |
151 | int ret; | 154 | int ret; |
@@ -153,8 +156,11 @@ static int s3c24xx_spi_setup(struct spi_device *spi) | |||
153 | if (!spi->bits_per_word) | 156 | if (!spi->bits_per_word) |
154 | spi->bits_per_word = 8; | 157 | spi->bits_per_word = 8; |
155 | 158 | ||
156 | if ((spi->mode & SPI_LSB_FIRST) != 0) | 159 | if (spi->mode & ~MODEBITS) { |
160 | dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n", | ||
161 | spi->mode & ~MODEBITS); | ||
157 | return -EINVAL; | 162 | return -EINVAL; |
163 | } | ||
158 | 164 | ||
159 | ret = s3c24xx_spi_setupxfer(spi, NULL); | 165 | ret = s3c24xx_spi_setupxfer(spi, NULL); |
160 | if (ret < 0) { | 166 | if (ret < 0) { |