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

Commit e59f30b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v4.9-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:
 "This includes:

   - Fix for a Layerscape driver issue that causes a use-before-set
     crash

   - Maintainer update for the Synopsis prototyping device driver"

* tag 'pci-v4.9-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: designware-plat: Update author email address
  PCI: layerscape: Fix drvdata usage before assignment
  PCI: designware-plat: Change maintainer to Jose Abreu
parents ec366cd1 02a1b8f4

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -9299,7 +9299,7 @@ S: Maintained 
F:	drivers/pci/host/*designware*



PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE

M:	Joao Pinto <jpinto@synopsys.com>

M:	Jose Abreu <Jose.Abreu@synopsys.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/designware-pcie.txt

drivers/pci/host/pci-layerscape.c

+1 −1
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev) 


	pp = &pcie->pp;

	pp->dev = dev;

	pcie->drvdata = match->data;

	pp->ops = pcie->drvdata->ops;



	dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
@@ -256,7 +257,6 @@ static int __init ls_pcie_probe(struct platform_device *pdev) 
		return PTR_ERR(pcie->pp.dbi_base);

	}



	pcie->drvdata = match->data;

	pcie->lut = pcie->pp.dbi_base + pcie->drvdata->lut_offset;



	if (!ls_pcie_is_bridge(pcie))

drivers/pci/host/pcie-designware-plat.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2015-2016 Synopsys, Inc. (www.synopsys.com)

 *

 * Authors: Joao Pinto <jpinto@synopsys.com>

 * Authors: Joao Pinto <jpmpinto@gmail.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as