Commit 69fa3ef3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/pci/ftpci100' 

- Release clock resources on error paths (Junyan Ye)

* pci/pci/ftpci100:
  PCI: ftpci100: Release the clock resources
parents 99f7b809 c60738de

drivers/pci/controller/pci-ftpci100.c

+2 −12
Original line number Diff line number Diff line
@@ -429,22 +429,12 @@ static int faraday_pci_probe(struct platform_device *pdev) 
	p->dev = dev;



	/* Retrieve and enable optional clocks */

	clk = devm_clk_get(dev, "PCLK");

	clk = devm_clk_get_enabled(dev, "PCLK");

	if (IS_ERR(clk))

		return PTR_ERR(clk);

	ret = clk_prepare_enable(clk);

	if (ret) {

		dev_err(dev, "could not prepare PCLK\n");

		return ret;

	}

	p->bus_clk = devm_clk_get(dev, "PCICLK");

	p->bus_clk = devm_clk_get_enabled(dev, "PCICLK");

	if (IS_ERR(p->bus_clk))

		return PTR_ERR(p->bus_clk);

	ret = clk_prepare_enable(p->bus_clk);

	if (ret) {

		dev_err(dev, "could not prepare PCICLK\n");

		return ret;

	}



	p->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(p->base))