]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mmc: queue: remove BUG_ON for bounce_sg
authorShawn Lin <shawn.lin@rock-chips.com>
Wed, 2 Nov 2016 07:26:49 +0000 (15:26 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 5 Dec 2016 09:31:13 +0000 (10:31 +0100)
bounce_sg for mqrq_cur and mqrq_pre are proper
allocated when initializing the queue and will not
be freed before explicitly cleaning the queue. So from
the code itself it should be quite confident to remove
this check. If that BUG_ON take effects, it is mostly
likely the memory is randomly oopsing.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/card/queue.c

index 32ab5a1947b0c58bc1f4d71d1b3445165ada02d0..cf29809f69e4e2cc462ff0e6e2f71d620a551913 100644 (file)
@@ -445,8 +445,6 @@ unsigned int mmc_queue_map_sg(struct mmc_queue *mq, struct mmc_queue_req *mqrq)
        if (!mqrq->bounce_buf)
                return blk_rq_map_sg(mq->queue, mqrq->req, mqrq->sg);
 
-       BUG_ON(!mqrq->bounce_sg);
-
        sg_len = blk_rq_map_sg(mq->queue, mqrq->req, mqrq->bounce_sg);
 
        mqrq->bounce_sg_len = sg_len;