diff --git a/[refs] b/[refs]
index f75372a75d0d..bd81fa76700b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ad1e5b5d1dde19f09e728ba8b5164968f9dabeb
+refs/heads/master: c895db0fb2c9e77fd94ba7995e2a01652a91910c
diff --git a/trunk/drivers/spi/spi-mxs.c b/trunk/drivers/spi/spi-mxs.c
index 130a43688352..447f917fe66f 100644
--- a/trunk/drivers/spi/spi-mxs.c
+++ b/trunk/drivers/spi/spi-mxs.c
@@ -439,8 +439,10 @@ static int mxs_spi_transfer_one(struct spi_master *master,
 		}
 
 		m->actual_length += t->len;
-		if (status)
+		if (status) {
+			stmp_reset_block(ssp->base);
 			break;
+		}
 
 		first = last = 0;
 	}