aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-02-09 12:34:30 -0500
committerUlf Hansson <ulf.hansson@linaro.org>2016-02-10 03:12:34 -0500
commitf00ab14c252ac459e86194747a1f580ab503c954 (patch)
tree2b84549a442e013caa9dbf961b73405194c3878e
parent07e7716c746dd4e43211903eac954a18192d3d14 (diff)
mmc: block: return error on failed mmc_blk_get()
This used to return -EFAULT, but the function above returns -EINVAL on the same condition so let's stick to that. The removal of error return on this path was introduced with b093410c9aef ('mmc: block: copy resp[] data on err for MMC_IOC_MULTI_CMD'). Fixes: b093410c9aef ('mmc: block: copy resp[] data on err for MMC_IOC_MULTI_CMD'). Signed-off-by: Olof Johansson <olof@lixom.net> Cc: Grant Grundler <grundler@google.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/card/block.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 5914263090fc..951641a96806 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -655,8 +655,10 @@ static int mmc_blk_ioctl_multi_cmd(struct block_device *bdev,
655 } 655 }
656 656
657 md = mmc_blk_get(bdev->bd_disk); 657 md = mmc_blk_get(bdev->bd_disk);
658 if (!md) 658 if (!md) {
659 err = -EINVAL;
659 goto cmd_err; 660 goto cmd_err;
661 }
660 662
661 card = md->queue.card; 663 card = md->queue.card;
662 if (IS_ERR(card)) { 664 if (IS_ERR(card)) {