From: Ian Molton <ian.molton@codethink.co.uk>
Date: Sun, 26 Apr 2015 23:01:06 +0000 (+0100)
Subject: mmc: TMIO: Ensure MFD cell is disabled on probe error path
X-Git-Tag: firefly_0821_release~176^2~1614^2~87
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=25db67e2ce2fdf43a99d89d201c356267ab06bf7;p=firefly-linux-kernel-4.4.55.git

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>
---

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;