From: Simon Baatz <gmbnomis@gmail.com>
To: linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org,
devicetree-discuss@lists.ozlabs.org
Cc: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Chris Ball <cjb@laptop.org>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Subject: [PATCH V2 02/10] mmc: sh_mmcif: handle mmc_of_parse() errors during probe
Date: Mon, 13 May 2013 23:18:53 +0200 [thread overview]
Message-ID: <1368479941-10084-3-git-send-email-gmbnomis@gmail.com> (raw)
In-Reply-To: <1368479941-10084-1-git-send-email-gmbnomis@gmail.com>
Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
---
drivers/mmc/host/sh_mmcif.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index ba76a53..6ded7fb 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1369,7 +1369,11 @@ static int sh_mmcif_probe(struct platform_device *pdev)
ret = -ENOMEM;
goto ealloch;
}
- mmc_of_parse(mmc);
+
+ ret = mmc_of_parse(mmc);
+ if (ret < 0)
+ goto eofparse;
+
host = mmc_priv(mmc);
host->mmc = mmc;
host->addr = reg;
@@ -1464,6 +1468,7 @@ eclkupdate:
clk_put(host->hclk);
eclkget:
pm_runtime_disable(&pdev->dev);
+eofparse:
mmc_free_host(mmc);
ealloch:
iounmap(reg);
--
1.7.9.5
next prev parent reply other threads:[~2013-05-13 21:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-13 21:18 [PATCH V2 00/10] mmc_of_parse() adaptations, DT support for Sheevaplugs Simon Baatz
2013-05-13 21:18 ` [PATCH V2 01/10] mmc: return mmc_of_parse() errors to caller Simon Baatz
2013-05-14 7:20 ` Ulf Hansson
2013-05-13 21:18 ` Simon Baatz [this message]
2013-05-13 21:18 ` [PATCH V2 03/10] mmc: tmio-mmc: handle mmc_of_parse() errors during probe Simon Baatz
2013-05-13 21:18 ` [PATCH V2 04/10] mmc: mxcmmc: " Simon Baatz
2013-05-13 21:18 ` [PATCH V2 05/10] mmc: sdhi-pxav3: " Simon Baatz
[not found] ` <1368479941-10084-6-git-send-email-gmbnomis-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-05-14 6:38 ` Guennadi Liakhovetski
2013-05-13 21:18 ` [PATCH V2 06/10] mmc: tegra: " Simon Baatz
2013-05-13 21:18 ` [PATCH V2 07/10] ARM: mvebu: Use standard MMC binding for all users of mvsdio Simon Baatz
[not found] ` <1368479941-10084-8-git-send-email-gmbnomis-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-05-13 23:09 ` Jason Cooper
2013-05-14 5:37 ` Simon Baatz
2013-05-15 0:29 ` Jason Cooper
2013-05-13 21:18 ` [PATCH V2 08/10] mmc: mvsdio: use standard MMC device-tree binding parser mmc_of_parse() Simon Baatz
2013-05-13 21:19 ` [PATCH V2 09/10] ARM: Kirkwood: Add dts files for Sheevaplug and eSATA Sheevaplug Simon Baatz
[not found] ` <1368479941-10084-10-git-send-email-gmbnomis-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-05-15 0:31 ` Jason Cooper
2013-05-13 21:19 ` [PATCH V2 10/10] ARM: Kirkwood: add DT support for Sheevaplug and Sheevaplug eSATA Simon Baatz
[not found] ` <1368479941-10084-11-git-send-email-gmbnomis-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-05-15 0:42 ` Jason Cooper
2013-05-14 6:37 ` [PATCH V2 00/10] mmc_of_parse() adaptations, DT support for Sheevaplugs Guennadi Liakhovetski
2013-05-14 16:26 ` Simon Baatz
2013-05-15 19:42 ` Simon Baatz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368479941-10084-3-git-send-email-gmbnomis@gmail.com \
--to=gmbnomis@gmail.com \
--cc=andrew@lunn.ch \
--cc=cjb@laptop.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=g.liakhovetski@gmx.de \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox