summaryrefslogtreecommitdiff
path: root/drivers/mmc/core
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2018-05-21 16:49:25 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2018-05-21 16:49:25 +0300
commit8603f1e83897d3e4ed28c2c51ed6e8ef675908d9 (patch)
tree6dcd4ae6b6bf5fd2d7bf6dd3b92522dbc3fca73d /drivers/mmc/core
parent9181ece38c93679ec413580f9ddf05b5cdb214db (diff)
parent3de06d5a1f05c11c94cbb68af14dbfa7fb81d78b (diff)
downloadlinux-8603f1e83897d3e4ed28c2c51ed6e8ef675908d9.tar.xz
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/core')
-rw-r--r--drivers/mmc/core/block.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 54457d8745cd..2ebba2299138 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -2486,7 +2486,7 @@ static long mmc_rpmb_ioctl(struct file *filp, unsigned int cmd,
break;
}
- return 0;
+ return ret;
}
#ifdef CONFIG_COMPAT