mmc: block: return error on failed mmc_blk_get()
authorOlof Johansson <olof@lixom.net>
Tue, 9 Feb 2016 17:34:30 +0000 (09:34 -0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 10 Feb 2016 08:12:34 +0000 (09:12 +0100)
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>
drivers/mmc/card/block.c

index 5914263090fc81447e26130baab143802504c088..951641a9680694b34bf2f62f043ec5ca9540e9fa 100644 (file)
@@ -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)) {