Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/spi/orion_spi.c b/drivers/spi/orion_spi.c
index 3aea50da7b29..0b677dc041ad 100644
--- a/drivers/spi/orion_spi.c
+++ b/drivers/spi/orion_spi.c
@@ -404,7 +404,7 @@ static int orion_spi_transfer(struct spi_device *spi, struct spi_message *m)
                         goto msg_rejected;
                 }
 
-                if ((t != NULL) && t->bits_per_word)
+                if (t->bits_per_word)
                         bits_per_word = t->bits_per_word;
 
                 if ((bits_per_word != 8) && (bits_per_word != 16)) {
@@ -415,7 +415,7 @@ static int orion_spi_transfer(struct spi_device *spi, struct spi_message *m)
                         goto msg_rejected;
                 }
                 /*make sure buffer length is even when working in 16 bit mode*/
-                if ((t != NULL) && (t->bits_per_word == 16) && (t->len & 1)) {
+                if ((t->bits_per_word == 16) && (t->len & 1)) {
                         dev_err(&spi->dev,
                                 "message rejected : "
                                 "odd data length (%d) while in 16 bit mode\n",