| Message ID | 1418895704-25908-3-git-send-email-ulf.hansson@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2014-12-18 1:41 GMT-08:00 Ulf Hansson <ulf.hansson@linaro.org>: > Since mmc_of_parse() may fail, let's deal with it and thus do proper > error handling. > > Cc: Christian Daudt <bcm@fixthebug.org> > Cc: Matt Porter <mporter@linaro.org> > Cc: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Florian Fainelli <f.fainelli@gmail.com> > --- > drivers/mmc/host/sdhci-bcm-kona.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c > index e7e4fbd..34bb8f9 100644 > --- a/drivers/mmc/host/sdhci-bcm-kona.c > +++ b/drivers/mmc/host/sdhci-bcm-kona.c > @@ -254,7 +254,9 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) > kona_dev = sdhci_pltfm_priv(pltfm_priv); > mutex_init(&kona_dev->write_lock); > > - mmc_of_parse(host->mmc); > + ret = mmc_of_parse(host->mmc); > + if (ret) > + goto err_pltfm_free; > > if (!host->mmc->f_max) { > dev_err(&pdev->dev, "Missing max-freq for SDHCI cfg\n"); > -- > 1.9.1 >
diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index e7e4fbd..34bb8f9 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -254,7 +254,9 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) kona_dev = sdhci_pltfm_priv(pltfm_priv); mutex_init(&kona_dev->write_lock); - mmc_of_parse(host->mmc); + ret = mmc_of_parse(host->mmc); + if (ret) + goto err_pltfm_free; if (!host->mmc->f_max) { dev_err(&pdev->dev, "Missing max-freq for SDHCI cfg\n");
Since mmc_of_parse() may fail, let's deal with it and thus do proper error handling. Cc: Christian Daudt <bcm@fixthebug.org> Cc: Matt Porter <mporter@linaro.org> Cc: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/mmc/host/sdhci-bcm-kona.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)