diff options
author | Jens Axboe <axboe@fb.com> | 2017-02-17 16:08:19 -0500 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-02-17 16:08:19 -0500 |
commit | 818551e2b2c662a1b26de6b4f7d6b8411a838d18 (patch) | |
tree | f38b4c951df4d33db81ae7b7765a56bce491c2a8 /drivers/mmc/core/queue.c | |
parent | 6010720da8aab51f33beee63b73cf88016e9b250 (diff) | |
parent | 7520872c0cf4d3df6d74242c6edfb9e70a47df4d (diff) |
Merge branch 'for-4.11/next' into for-4.11/linus-merge
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/mmc/core/queue.c')
-rw-r--r-- | drivers/mmc/core/queue.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index a6496d8027bc..033f641eb8b7 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c | |||
@@ -30,15 +30,6 @@ static int mmc_prep_request(struct request_queue *q, struct request *req) | |||
30 | { | 30 | { |
31 | struct mmc_queue *mq = q->queuedata; | 31 | struct mmc_queue *mq = q->queuedata; |
32 | 32 | ||
33 | /* | ||
34 | * We only like normal block requests and discards. | ||
35 | */ | ||
36 | if (req->cmd_type != REQ_TYPE_FS && req_op(req) != REQ_OP_DISCARD && | ||
37 | req_op(req) != REQ_OP_SECURE_ERASE) { | ||
38 | blk_dump_rq_flags(req, "MMC bad request"); | ||
39 | return BLKPREP_KILL; | ||
40 | } | ||
41 | |||
42 | if (mq && (mmc_card_removed(mq->card) || mmc_access_rpmb(mq))) | 33 | if (mq && (mmc_card_removed(mq->card) || mmc_access_rpmb(mq))) |
43 | return BLKPREP_KILL; | 34 | return BLKPREP_KILL; |
44 | 35 | ||