Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
mmc
/
host
/
sdhci-bcm2835.c
diff --git
a/kernel/drivers/mmc/host/sdhci-bcm2835.c
b/kernel/drivers/mmc/host/sdhci-bcm2835.c
index
0ef0343
..
1c65d46
100644
(file)
--- a/
kernel/drivers/mmc/host/sdhci-bcm2835.c
+++ b/
kernel/drivers/mmc/host/sdhci-bcm2835.c
@@
-172,9
+172,19
@@
static int bcm2835_sdhci_probe(struct platform_device *pdev)
ret = PTR_ERR(pltfm_host->clk);
goto err;
}
ret = PTR_ERR(pltfm_host->clk);
goto err;
}
+ ret = clk_prepare_enable(pltfm_host->clk);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to enable host clk\n");
+ goto err;
+ }
- return sdhci_add_host(host);
+ ret = sdhci_add_host(host);
+ if (ret)
+ goto err_clk;
+ return 0;
+err_clk:
+ clk_disable_unprepare(pltfm_host->clk);
err:
sdhci_pltfm_free(pdev);
return ret;
err:
sdhci_pltfm_free(pdev);
return ret;