diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-08 22:34:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-08 22:34:35 -0400 |
| commit | a8a0811314db714ae23ab9f0ea707711a076bf18 (patch) | |
| tree | 6088a077d0abf4ce4a913733cb2fb2d17a85acbd /drivers/mmc/card/queue.c | |
| parent | 26b293e854406ea4276b566cef75426adc3a9688 (diff) | |
| parent | 4de3bf66c61ef708d8f22d7f990339668a858e7d (diff) | |
Merge tag 'mmc-4.1-rc2' of git://git.linaro.org/people/ulf.hansson/mmc
Pull MMC fixes from Ulf Hansson:
"MMC core:
- Don't access RPMB partitions for normal read/write
- Fix hibernation restore sequence
MMC host:
- dw_mmc: Fix card detection for non removable cards
- dw_mmc: Fix sglist issue in 32-bit mode
- sh_mmcif: Fix timeout value for command request"
* tag 'mmc-4.1-rc2' of git://git.linaro.org/people/ulf.hansson/mmc:
mmc: dw_mmc: dw_mci_get_cd check MMC_CAP_NONREMOVABLE
mmc: dw_mmc: init desc in dw_mci_idmac_init
mmc: card: Don't access RPMB partitions for normal read/write
mmc: sh_mmcif: Fix timeout value for command request
mmc: core: add missing pm event in mmc_pm_notify to fix hib restore
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 236d194c2883..8efa3684aef8 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) | |||
| 38 | return BLKPREP_KILL; | 38 | return BLKPREP_KILL; |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | if (mq && mmc_card_removed(mq->card)) | 41 | if (mq && (mmc_card_removed(mq->card) || mmc_access_rpmb(mq))) |
| 42 | return BLKPREP_KILL; | 42 | return BLKPREP_KILL; |
| 43 | 43 | ||
| 44 | req->cmd_flags |= REQ_DONTPREP; | 44 | req->cmd_flags |= REQ_DONTPREP; |