|
@@ -497,7 +497,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
|
|
if (IS_ERR(priv->clk)) {
|
|
if (IS_ERR(priv->clk)) {
|
|
ret = PTR_ERR(priv->clk);
|
|
ret = PTR_ERR(priv->clk);
|
|
dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
|
|
dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
|
|
- goto eprobe;
|
|
|
|
|
|
+ return ret;
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -524,10 +524,8 @@ int renesas_sdhi_probe(struct platform_device *pdev,
|
|
}
|
|
}
|
|
|
|
|
|
host = tmio_mmc_host_alloc(pdev);
|
|
host = tmio_mmc_host_alloc(pdev);
|
|
- if (!host) {
|
|
|
|
- ret = -ENOMEM;
|
|
|
|
- goto eprobe;
|
|
|
|
- }
|
|
|
|
|
|
+ if (!host)
|
|
|
|
+ return -ENOMEM;
|
|
|
|
|
|
if (of_data) {
|
|
if (of_data) {
|
|
mmc_data->flags |= of_data->tmio_flags;
|
|
mmc_data->flags |= of_data->tmio_flags;
|
|
@@ -652,7 +650,7 @@ eirq:
|
|
tmio_mmc_host_remove(host);
|
|
tmio_mmc_host_remove(host);
|
|
efree:
|
|
efree:
|
|
tmio_mmc_host_free(host);
|
|
tmio_mmc_host_free(host);
|
|
-eprobe:
|
|
|
|
|
|
+
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(renesas_sdhi_probe);
|
|
EXPORT_SYMBOL_GPL(renesas_sdhi_probe);
|