Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 544714d8 authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Bjorn Helgaas
Browse files

PCI: exynos: Initialize elbi_base even when using PHY framework 



Even when using the PHY framework, we need the elbi_base.  Before this
patch, we didn't initialize elbi_base, which caused NULL pointer
dereferences later.

Fixes: e7cd7ef5 ("PCI: exynos: Support the PHY generic framework")
Signed-off-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent c1ae3cfa

drivers/pci/dwc/pci-exynos.c

+4 −4
Original line number Diff line number Diff line
@@ -132,10 +132,6 @@ static int exynos5440_pcie_get_mem_resources(struct platform_device *pdev, 
	struct device *dev = pci->dev;

	struct resource *res;



	/* If using the PHY framework, doesn't need to get other resource */

	if (ep->using_phy)

		return 0;



	ep->mem_res = devm_kzalloc(dev, sizeof(*ep->mem_res), GFP_KERNEL);

	if (!ep->mem_res)

		return -ENOMEM;
@@ -145,6 +141,10 @@ static int exynos5440_pcie_get_mem_resources(struct platform_device *pdev, 
	if (IS_ERR(ep->mem_res->elbi_base))

		return PTR_ERR(ep->mem_res->elbi_base);



	/* If using the PHY framework, doesn't need to get other resource */

	if (ep->using_phy)

		return 0;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	ep->mem_res->phy_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(ep->mem_res->phy_base))