summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/tmio_mmc.c
diff options
context:
space:
mode:
authorIan Molton <ian.molton@codethink.co.uk>2015-04-27 00:01:06 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2015-06-01 09:06:47 +0200
commit25db67e2ce2fdf43a99d89d201c356267ab06bf7 (patch)
treed8bb17435322b559b1de39b306914051e3e74654 /drivers/mmc/host/tmio_mmc.c
parent2dbf1dc305d5881d743a64255c406ce1c970e728 (diff)
downloadlinux-25db67e2ce2fdf43a99d89d201c356267ab06bf7.tar.gz
linux-25db67e2ce2fdf43a99d89d201c356267ab06bf7.tar.bz2
linux-25db67e2ce2fdf43a99d89d201c356267ab06bf7.zip
mmc: TMIO: Ensure MFD cell is disabled on probe error path
Signed-off-by: Ian Molton <ian.molton@codethink.co.uk> Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/tmio_mmc.c')
-rw-r--r--drivers/mmc/host/tmio_mmc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index f746df493892..3d368b830e7c 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -85,8 +85,10 @@ static int tmio_mmc_probe(struct platform_device *pdev)
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res)
- return -EINVAL;
+ if (!res) {
+ ret = -EINVAL;
+ goto cell_disable;
+ }
pdata->flags |= TMIO_MMC_HAVE_HIGH_REG;