X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fdrivers%2Fspi%2Fspi-au1550.c;fp=kernel%2Fdrivers%2Fspi%2Fspi-au1550.c;h=afd239d6dec1432350b1fdc5cf3e58c43562dff6;hb=e09b41010ba33a20a87472ee821fa407a5b8da36;hp=f45e085c01a616436f7a6b115e69bb8144012463;hpb=f93b97fd65072de626c074dbe099a1fff05ce060;p=kvmfornfv.git

diff --git a/kernel/drivers/spi/spi-au1550.c b/kernel/drivers/spi/spi-au1550.c
index f45e085c0..afd239d6d 100644
--- a/kernel/drivers/spi/spi-au1550.c
+++ b/kernel/drivers/spi/spi-au1550.c
@@ -233,13 +233,12 @@ static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
 	unsigned bpw, hz;
 	u32 cfg, stat;
 
-	bpw = spi->bits_per_word;
-	hz = spi->max_speed_hz;
 	if (t) {
-		if (t->bits_per_word)
-			bpw = t->bits_per_word;
-		if (t->speed_hz)
-			hz = t->speed_hz;
+		bpw = t->bits_per_word;
+		hz = t->speed_hz;
+	} else {
+		bpw = spi->bits_per_word;
+		hz = spi->max_speed_hz;
 	}
 
 	if (!hz)