Commit 1f42bc19 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/imx6' 

- Remove unused assignment (Krzysztof Wilczyński)

* remotes/lorenzo/pci/imx6:
  PCI: imx6: Remove unused assignment to variable ret
parents fd6c10ca 65315ec5

drivers/pci/controller/dwc/pci-imx6.c

+1 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ static int imx6_pcie_probe(struct platform_device *pdev) 


	/* Limit link speed */

	pci->link_gen = 1;

	ret = of_property_read_u32(node, "fsl,max-link-speed", &pci->link_gen);

	of_property_read_u32(node, "fsl,max-link-speed", &pci->link_gen);



	imx6_pcie->vpcie = devm_regulator_get_optional(&pdev->dev, "vpcie");

	if (IS_ERR(imx6_pcie->vpcie)) {