| Message ID | 1478071609-12941-1-git-send-email-shawn.lin@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2 November 2016 at 08:26, Shawn Lin <shawn.lin@rock-chips.com> wrote: > 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> Thanks, applied for next! Kind regards Uffe > --- > > drivers/mmc/card/queue.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c > index 8037f73..6c8978a 100644 > --- a/drivers/mmc/card/queue.c > +++ b/drivers/mmc/card/queue.c > @@ -505,8 +505,6 @@ unsigned int mmc_queue_map_sg(struct mmc_queue *mq, struct mmc_queue_req *mqrq) > return blk_rq_map_sg(mq->queue, mqrq->req, mqrq->sg); > } > > - BUG_ON(!mqrq->bounce_sg); > - > if (mmc_packed_cmd(cmd_type)) > sg_len = mmc_queue_packed_map_sg(mq, mqrq->packed, > mqrq->bounce_sg, cmd_type); > -- > 2.3.7 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 8037f73..6c8978a 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -505,8 +505,6 @@ unsigned int mmc_queue_map_sg(struct mmc_queue *mq, struct mmc_queue_req *mqrq) return blk_rq_map_sg(mq->queue, mqrq->req, mqrq->sg); } - BUG_ON(!mqrq->bounce_sg); - if (mmc_packed_cmd(cmd_type)) sg_len = mmc_queue_packed_map_sg(mq, mqrq->packed, mqrq->bounce_sg, cmd_type);
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> --- drivers/mmc/card/queue.c | 2 -- 1 file changed, 2 deletions(-)