diff options
| author | Alexey Khoroshilov | 2018-12-07 23:57:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-05 22:33:12 +0200 |
| commit | a2479c401054913f1bbc780d06dbf5ceada7d1ff (patch) | |
| tree | 0de88420132ed54a9ec8c2f548fb7e5a55d3c58e | |
| parent | efi/arm/arm64: Allow SetVirtualAddressMap() to be omitted (diff) | |
| download | kernel-qcow2-linux-a2479c401054913f1bbc780d06dbf5ceada7d1ff.tar.gz kernel-qcow2-linux-a2479c401054913f1bbc780d06dbf5ceada7d1ff.tar.xz kernel-qcow2-linux-a2479c401054913f1bbc780d06dbf5ceada7d1ff.zip | |
soc: qcom: gsbi: Fix error handling in gsbi_probe()
[ Upstream commit 8cd09a3dd3e176c62da67efcd477a44a8d87185e ]
If of_platform_populate() fails in gsbi_probe(),
gsbi->hclk is left undisabled.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/soc/qcom/qcom_gsbi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c index 09c669e70d63..038abc377fdb 100644 --- a/drivers/soc/qcom/qcom_gsbi.c +++ b/drivers/soc/qcom/qcom_gsbi.c @@ -138,7 +138,7 @@ static int gsbi_probe(struct platform_device *pdev) struct resource *res; void __iomem *base; struct gsbi_info *gsbi; - int i; + int i, ret; u32 mask, gsbi_num; const struct crci_config *config = NULL; @@ -221,7 +221,10 @@ static int gsbi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, gsbi); - return of_platform_populate(node, NULL, NULL, &pdev->dev); + ret = of_platform_populate(node, NULL, NULL, &pdev->dev); + if (ret) + clk_disable_unprepare(gsbi->hclk); + return ret; } static int gsbi_remove(struct platform_device *pdev) |