diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-08-09 20:13:12 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-08-09 20:13:12 -0500 |
| commit | f0a3665629bd0e3aa440168b55caea721a77f158 (patch) | |
| tree | b49c9b4c3f2607f3a299d10c17e3283df9f34673 /drivers/mmc/card/queue.c | |
| parent | e33823607da84625db9f1a2e4eb02c578d240e72 (diff) | |
| parent | 590e935df0c94b2d7a4584bb26906666176a6133 (diff) | |
Merge tag 'lsk-v3.18-15.07-rt' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v3.18-rt
LSK RT 15.07 v3.18
Diffstat (limited to 'drivers/mmc/card/queue.c')
| -rw-r--r-- | drivers/mmc/card/queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index cfa6110632c3..7a41a221d248 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -38,7 +38,7 @@ static int mmc_prep_request(struct request_queue *q, struct request *req) return BLKPREP_KILL; } - if (mq && mmc_card_removed(mq->card)) + if (mq && (mmc_card_removed(mq->card) || mmc_access_rpmb(mq))) return BLKPREP_KILL; req->cmd_flags |= REQ_DONTPREP; |