diff options
| author | Greg Kroah-Hartman | 2016-02-14 23:36:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-02-14 23:36:04 +0100 |
| commit | 249f3c4fe4fdef159d3f9b3f7a6c41a92103c860 (patch) | |
| tree | 58abfec8444741fd3bd403a908be50c4f63d4842 /drivers/mmc/card | |
| parent | xen/hvc: constify hv_ops structures (diff) | |
| parent | Linux 4.5-rc4 (diff) | |
| download | kernel-qcow2-linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.tar.gz kernel-qcow2-linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.tar.xz kernel-qcow2-linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.zip | |
Merge 4.5-rc4 into tty-next
We want the fixes in here, and this resolves a merge error in tty_io.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mmc/card')
| -rw-r--r-- | drivers/mmc/card/block.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 5914263090fc..fe207e542032 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -47,13 +47,10 @@ #include "queue.h" MODULE_ALIAS("mmc:block"); - -#ifdef KERNEL #ifdef MODULE_PARAM_PREFIX #undef MODULE_PARAM_PREFIX #endif #define MODULE_PARAM_PREFIX "mmcblk." -#endif #define INAND_CMD38_ARG_EXT_CSD 113 #define INAND_CMD38_ARG_ERASE 0x00 @@ -655,8 +652,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)) { |