[PATCH 4.14 47/62] mmc: block: propagate correct returned value in mmc_rpmb_ioctl

From: Greg Kroah-Hartman
Date: Sat Jan 11 2020 - 05:11:33 EST


From: Mathieu Malaterre <malat@xxxxxxxxxx>

commit b25b750df99bcba29317d3f9d9f93c4ec58890e6 upstream.

In commit 97548575bef3 ("mmc: block: Convert RPMB to a character device") a
new function `mmc_rpmb_ioctl` was added. The final return is simply
returning a value of `0` instead of propagating the correct return code.

Discovered during a compilation with W=1, silence the following gcc warning

drivers/mmc/core/block.c:2470:6: warning: variable âretâ set but not used
[-Wunused-but-set-variable]

Signed-off-by: Mathieu Malaterre <malat@xxxxxxxxxx>
Reviewed-by: Shawn Lin <shawn.lin@xxxxxxxxxxxxxx>
Fixes: 97548575bef3 ("mmc: block: Convert RPMB to a character device")
Cc: stable@xxxxxxxxxxxxxxx # v4.15+
Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
Cc: Jisheng Zhang <Jisheng.Zhang@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/mmc/core/block.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -2305,7 +2305,7 @@ static long mmc_rpmb_ioctl(struct file *
break;
}

- return 0;
+ return ret;
}

#ifdef CONFIG_COMPAT