| From | Greg Kroah-Hartman <> | Subject | [PATCH 4.4 141/312] mmc: block: return error on failed mmc_blk_get() | Date | Fri, 8 May 2020 14:32:12 +0200 |
| |
From: Olof Johansson <olof@lixom.net>
commit f00ab14c252ac459e86194747a1f580ab503c954 upstream.
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- drivers/mmc/card/block.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -668,8 +668,10 @@ static int mmc_blk_ioctl_multi_cmd(struc } md = mmc_blk_get(bdev->bd_disk); - if (!md) + if (!md) { + err = -EINVAL; goto cmd_err; + } card = md->queue.card; if (IS_ERR(card)) {
|