Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1330528 > unrolled thread

[PATCH] mmc: block: return error on failed mmc_blk_get()

Back to article view | Back to linux.kernel

Contents

  [PATCH] mmc: block: return error on failed mmc_blk_get() Olof Johansson <olof@lixom.net> - 2016-02-09 18:40 +0100
    Re: [PATCH] mmc: block: return error on failed mmc_blk_get() Ulf Hansson <ulf.hansson@linaro.org> - 2016-02-10 09:20 +0100

#1330528 — [PATCH] 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>
---
 drivers/mmc/card/block.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 57a5b6d..b3ec4fb 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)) {
-- 
2.1.4

[toc] | [next] | [standalone]

#1330944

On 9 February 2016 at 18:34, Olof Johansson <olof@lixom.net> wrote:
> 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>

Thanks, applied for fixes!

Kind regards
Uffe

> ---
>  drivers/mmc/card/block.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
> index 57a5b6d..b3ec4fb 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)) {
> --
> 2.1.4
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web