1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 86c155aea0cf..0ce82db8e484 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -570,9 +570,8 @@ static void giveback(struct driver_data *drv_data)
                 /* see if the next and current messages point
                  * to the same chip
                  */
-                if (next_msg && next_msg->spi != msg->spi)
-                        next_msg = NULL;
-                if (!next_msg || msg->state == ERROR_STATE)
+                if ((next_msg && next_msg->spi != msg->spi) ||
+                    msg->state == ERROR_STATE)
                         cs_deassert(drv_data);
         }