diff options
| author |   Olof Johansson <olof@lixom.net> | 2016-02-09 09:34:30 -0800 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2016-02-10 09:12:34 +0100 |
| commit | f00ab14c252ac459e86194747a1f580ab503c954 (patch) | |
| tree | 2b84549a442e013caa9dbf961b73405194c3878e /drivers/mmc | |
| parent | mmc: pxamci: fix the device-tree probe deferral path (diff) | |
| download | linux-dev-f00ab14c252ac459e86194747a1f580ab503c954.tar.xz linux-dev-f00ab14c252ac459e86194747a1f580ab503c954.zip | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/card/block.c | 4 |
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, } md = mmc_blk_get(bdev->bd_disk); - if (!md) + if (!md) { + err = -EINVAL; goto cmd_err; + } card = md->queue.card; if (IS_ERR(card)) { |