From 6e9b74562dbc14f0f4347ea5796c157553945625 Mon Sep 17 00:00:00 2001
From: John Linn <john.linn@xilinx.com>
Date: Mon, 14 Sep 2009 08:17:05 +0000
Subject: [PATCH] --- yaml --- r: 175832 b: refs/heads/master c:
 1a8d3b777dd71813b87c66c0eb161cc87f042126 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/spi/xilinx_spi.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1e28a8824d3e..633dd3e31a84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f856cf01787354fb3c8cde0a80de606f368b21ed
+refs/heads/master: 1a8d3b777dd71813b87c66c0eb161cc87f042126
diff --git a/trunk/drivers/spi/xilinx_spi.c b/trunk/drivers/spi/xilinx_spi.c
index 46b8c5c2f45e..5a143b9f6361 100644
--- a/trunk/drivers/spi/xilinx_spi.c
+++ b/trunk/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);