diff options
| author | John Linn | 2009-09-14 10:17:05 +0200 |
|---|---|---|
| committer | Grant Likely | 2009-11-05 00:42:47 +0100 |
| commit | 1a8d3b777dd71813b87c66c0eb161cc87f042126 (patch) | |
| tree | c29b546b014acb28e5d6a424a5abeed75c8279eb /drivers/spi | |
| parent | spi/mpc52xx-psc-spi: check for valid PSC (diff) | |
| download | kernel-qcow2-linux-1a8d3b777dd71813b87c66c0eb161cc87f042126.tar.gz kernel-qcow2-linux-1a8d3b777dd71813b87c66c0eb161cc87f042126.tar.xz kernel-qcow2-linux-1a8d3b777dd71813b87c66c0eb161cc87f042126.zip | |
Xilinx: SPI: Fix bits_per_word for transfers
The bits_per_word value can be set for each transfer, or can
be set to zero in each transfer in which case it should default
to the value in the driver.
The driver was fixed to properly check the bits_per_word in
the transfer that is passed in.
Signed-off-by: John Linn <john.linn@xilinx.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/xilinx_spi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 46b8c5c2f45e..5a143b9f6361 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -148,7 +148,8 @@ static int xilinx_spi_setup_transfer(struct spi_device *spi, { u8 bits_per_word; - bits_per_word = (t) ? t->bits_per_word : spi->bits_per_word; + bits_per_word = (t && t->bits_per_word) + ? t->bits_per_word : spi->bits_per_word; if (bits_per_word != 8) { dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n", __func__, bits_per_word); |