diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:10:22 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:10:22 -0500 |
| commit | 8c82da5e2495589b7b70a43789e7cbd61a486ed0 (patch) | |
| tree | fdde7380d2584d0297898373831f26cd5208cabd /drivers/spi/xilinx_spi.c | |
| parent | 51badebdcf394cc5fd574a524b55b3f6085e5e9c (diff) | |
| parent | 6d5355998a757a16815d58da4a739b15a6efbfba (diff) | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'drivers/spi/xilinx_spi.c')
| -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, | |||
| 148 | { | 148 | { |
| 149 | u8 bits_per_word; | 149 | u8 bits_per_word; |
| 150 | 150 | ||
| 151 | bits_per_word = (t) ? t->bits_per_word : spi->bits_per_word; | 151 | bits_per_word = (t && t->bits_per_word) |
| 152 | ? t->bits_per_word : spi->bits_per_word; | ||
| 152 | if (bits_per_word != 8) { | 153 | if (bits_per_word != 8) { |
| 153 | dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n", | 154 | dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n", |
| 154 | __func__, bits_per_word); | 155 | __func__, bits_per_word); |