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/mpc52xx_psc_spi.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/mpc52xx_psc_spi.c')
-rw-r--r-- | drivers/spi/mpc52xx_psc_spi.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c index 11f36bef305..d2a4b2bdb07 100644 --- a/drivers/spi/mpc52xx_psc_spi.c +++ b/drivers/spi/mpc52xx_psc_spi.c | |||
@@ -270,6 +270,9 @@ static void mpc52xx_psc_spi_work(struct work_struct *work) | |||
270 | spin_unlock_irq(&mps->lock); | 270 | spin_unlock_irq(&mps->lock); |
271 | } | 271 | } |
272 | 272 | ||
273 | /* the spi->mode bits understood by this driver: */ | ||
274 | #define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST) | ||
275 | |||
273 | static int mpc52xx_psc_spi_setup(struct spi_device *spi) | 276 | static int mpc52xx_psc_spi_setup(struct spi_device *spi) |
274 | { | 277 | { |
275 | struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master); | 278 | struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master); |
@@ -279,6 +282,12 @@ static int mpc52xx_psc_spi_setup(struct spi_device *spi) | |||
279 | if (spi->bits_per_word%8) | 282 | if (spi->bits_per_word%8) |
280 | return -EINVAL; | 283 | return -EINVAL; |
281 | 284 | ||
285 | if (spi->mode & ~MODEBITS) { | ||
286 | dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n", | ||
287 | spi->mode & ~MODEBITS); | ||
288 | return -EINVAL; | ||
289 | } | ||
290 | |||
282 | if (!cs) { | 291 | if (!cs) { |
283 | cs = kzalloc(sizeof *cs, GFP_KERNEL); | 292 | cs = kzalloc(sizeof *cs, GFP_KERNEL); |
284 | if (!cs) | 293 | if (!cs) |