| From e6115a664d26ca3e5a7935712d8a1de54aca4c74 Mon Sep 17 00:00:00 2001 |
| From: Simon Baatz <gmbnomis@gmail.com> |
| Date: Sun, 9 Jun 2013 22:14:13 +0200 |
| Subject: mmc: tmio-mmc: handle mmc_of_parse() errors during probe |
| |
| Signed-off-by: Simon Baatz <gmbnomis@gmail.com> |
| Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
| Signed-off-by: Chris Ball <cjb@laptop.org> |
| (cherry picked from commit 274a752b1adc7e756acb283edc188f27fb3be6f8) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc_pio.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c |
| index 1912d6f4..8486a22a 100644 |
| --- a/drivers/mmc/host/tmio_mmc_pio.c |
| +++ b/drivers/mmc/host/tmio_mmc_pio.c |
| @@ -1001,7 +1001,9 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host, |
| if (!mmc) |
| return -ENOMEM; |
| |
| - mmc_of_parse(mmc); |
| + ret = mmc_of_parse(mmc); |
| + if (ret < 0) |
| + goto host_free; |
| |
| pdata->dev = &pdev->dev; |
| _host = mmc_priv(mmc); |
| -- |
| 1.8.4.3.gca3854a |
| |
