aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorSimon Baatz <gmbnomis@gmail.com>2013-06-09 16:14:13 -0400
committerChris Ball <cjb@laptop.org>2013-06-27 10:22:57 -0400
commit274a752b1adc7e756acb283edc188f27fb3be6f8 (patch)
treef69f88e442efa0b9a5ef2c50a046ccf22e87b967 /drivers/mmc
parent2c9054dc102742e1683b5d879f7472fb712b7324 (diff)
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/tmio_mmc_pio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index f29470835a4f..b72edb72f7d2 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,
1001 if (!mmc) 1001 if (!mmc)
1002 return -ENOMEM; 1002 return -ENOMEM;
1003 1003
1004 mmc_of_parse(mmc); 1004 ret = mmc_of_parse(mmc);
1005 if (ret < 0)
1006 goto host_free;
1005 1007
1006 pdata->dev = &pdev->dev; 1008 pdata->dev = &pdev->dev;
1007 _host = mmc_priv(mmc); 1009 _host = mmc_priv(mmc);