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_mpc83xx.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_mpc83xx.c')
-rw-r--r-- | drivers/spi/spi_mpc83xx.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index e9798bf7b8c6..9cdbc12278e5 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c | |||
@@ -232,12 +232,21 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) | |||
232 | return 0; | 232 | return 0; |
233 | } | 233 | } |
234 | 234 | ||
235 | /* the spi->mode bits understood by this driver: */ | ||
236 | #define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH) | ||
237 | |||
235 | static int mpc83xx_spi_setup(struct spi_device *spi) | 238 | static int mpc83xx_spi_setup(struct spi_device *spi) |
236 | { | 239 | { |
237 | struct spi_bitbang *bitbang; | 240 | struct spi_bitbang *bitbang; |
238 | struct mpc83xx_spi *mpc83xx_spi; | 241 | struct mpc83xx_spi *mpc83xx_spi; |
239 | int retval; | 242 | int retval; |
240 | 243 | ||
244 | if (spi->mode & ~MODEBITS) { | ||
245 | dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n", | ||
246 | spi->mode & ~MODEBITS); | ||
247 | return -EINVAL; | ||
248 | } | ||
249 | |||
241 | if (!spi->max_speed_hz) | 250 | if (!spi->max_speed_hz) |
242 | return -EINVAL; | 251 | return -EINVAL; |
243 | 252 | ||