diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-09-28 22:29:11 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-10-04 18:46:28 -0400 |
commit | f8db3c9086cd33ee3efc913ade291694f54a57f2 (patch) | |
tree | d213730829f53ff36e260f19f29eae63e8805cee /drivers | |
parent | f62b878b4dfc71de24ea4bc085d042862cba88e4 (diff) |
PCI: exynos: Add missing clk_disable_unprepare() on error path
Add the missing clk_disable_unprepare() before return
from exynos_pcie_probe() in the error handling case.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pci/host/pci-exynos.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c index ee692c2c3d73..89804728bd5b 100644 --- a/drivers/pci/host/pci-exynos.c +++ b/drivers/pci/host/pci-exynos.c | |||
@@ -599,18 +599,24 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) | |||
599 | 599 | ||
600 | elbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 600 | elbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
601 | exynos_pcie->elbi_base = devm_ioremap_resource(&pdev->dev, elbi_base); | 601 | exynos_pcie->elbi_base = devm_ioremap_resource(&pdev->dev, elbi_base); |
602 | if (IS_ERR(exynos_pcie->elbi_base)) | 602 | if (IS_ERR(exynos_pcie->elbi_base)) { |
603 | return PTR_ERR(exynos_pcie->elbi_base); | 603 | ret = PTR_ERR(exynos_pcie->elbi_base); |
604 | goto fail_bus_clk; | ||
605 | } | ||
604 | 606 | ||
605 | phy_base = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 607 | phy_base = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
606 | exynos_pcie->phy_base = devm_ioremap_resource(&pdev->dev, phy_base); | 608 | exynos_pcie->phy_base = devm_ioremap_resource(&pdev->dev, phy_base); |
607 | if (IS_ERR(exynos_pcie->phy_base)) | 609 | if (IS_ERR(exynos_pcie->phy_base)) { |
608 | return PTR_ERR(exynos_pcie->phy_base); | 610 | ret = PTR_ERR(exynos_pcie->phy_base); |
611 | goto fail_bus_clk; | ||
612 | } | ||
609 | 613 | ||
610 | block_base = platform_get_resource(pdev, IORESOURCE_MEM, 2); | 614 | block_base = platform_get_resource(pdev, IORESOURCE_MEM, 2); |
611 | exynos_pcie->block_base = devm_ioremap_resource(&pdev->dev, block_base); | 615 | exynos_pcie->block_base = devm_ioremap_resource(&pdev->dev, block_base); |
612 | if (IS_ERR(exynos_pcie->block_base)) | 616 | if (IS_ERR(exynos_pcie->block_base)) { |
613 | return PTR_ERR(exynos_pcie->block_base); | 617 | ret = PTR_ERR(exynos_pcie->block_base); |
618 | goto fail_bus_clk; | ||
619 | } | ||
614 | 620 | ||
615 | ret = add_pcie_port(pp, pdev); | 621 | ret = add_pcie_port(pp, pdev); |
616 | if (ret < 0) | 622 | if (ret < 0) |