diff --git a/[refs] b/[refs] index 02d6faa37af3..a67a235c65b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 010b481834b2b60f7d8543263a63e69396019f7b +refs/heads/master: 204e706fa2ac1a62ff6423039945eb567c6c7efc diff --git a/trunk/drivers/spi/spi-mxs.c b/trunk/drivers/spi/spi-mxs.c index bcba098e97c5..138c8523dbba 100644 --- a/trunk/drivers/spi/spi-mxs.c +++ b/trunk/drivers/spi/spi-mxs.c @@ -473,12 +473,12 @@ static int mxs_spi_transfer_one(struct spi_master *master, &first, &last, 0); } - m->actual_length += t->len; if (status) { stmp_reset_block(ssp->base); break; } + m->actual_length += t->len; first = last = 0; }