mmc: card: fix write packing errors due to previous revert
Due to the revert and cherry-pick of latest version from
the community, we had some errors in the final code of packed
commands. This patch fixes this mismatch
(cherry picked from commit 47b37929ebffeb2672a4bcbea38ae4e79d7d4e26)
Change-Id: Iff688ca3aaa893d9bd7f876a8d2d7c3d4d750a8a
Signed-off-by: Maya Erez <merez@codeaurora.org>
(cherry picked from commit e05b4d698362433009b4cdef75952c72de0f38cf)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 7387d9a..28dd707 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1734,6 +1734,7 @@
brq->data.blksz = 512;
brq->data.blocks = mqrq->packed_blocks + 1;
brq->data.flags |= MMC_DATA_WRITE;
+ brq->data.fault_injected = false;
brq->stop.opcode = MMC_STOP_TRANSMISSION;
brq->stop.arg = 0;
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index cc91646..8897f18a 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -201,11 +201,12 @@
if (!mq->queue)
return -ENOMEM;
+ memset(&mq->mqrq_cur, 0, sizeof(mq->mqrq_cur));
+ memset(&mq->mqrq_prev, 0, sizeof(mq->mqrq_prev));
+
INIT_LIST_HEAD(&mqrq_cur->packed_list);
INIT_LIST_HEAD(&mqrq_prev->packed_list);
- memset(&mq->mqrq_cur, 0, sizeof(mq->mqrq_cur));
- memset(&mq->mqrq_prev, 0, sizeof(mq->mqrq_prev));
mq->mqrq_cur = mqrq_cur;
mq->mqrq_prev = mqrq_prev;
mq->queue->queuedata = mq;