renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 00:34:10 +08:00
Code

pci-v4.9-fixes-1

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJYCjA7AAoJEFmIoMA60/r8uUQP/1rNPSFgW1JeBKBKI0qRKyR+
 uTZHSb4Udy3MKHf7zzEtMuX/xI4kCctgGPv47dqBW4L93kmagA9WxmDSmVtJg+5Z
 usDBXpm3/Wvuj4YiDL6HmKjwWrL0vC+8q2psBtbj6wWRgSooj+NiTmGSiyhtkIba
 OsKy5g73k04owW64i9BJNavbMP8/tGZv47C/3tM3413aYk1ydvVPdYKdyxrCUrVG
 KGfCXn9Seg11/C2dWf6S5nGW3TlqicMzniOIrCsJIj+Ky2teWYeCPiDht5vUHPZa
 T+BsZ/YEjwvK7h1y7/jGAP1utkoNxX4I4wOZ7ts0IExYggrFs9+n+S//PdiqOVdH
 HE0gmt8qM1lHzB82+B8bIfsp76+PHetxbApq7GrWuoroVWAzTThntXWRYCneZjqv
 yNDOjQxAZiKWS1JRCWPyw0x/VpqqUbL2mGeTR521HtP/6l5on1cn9WocTz+VuXe2
 vM3+Hdomijr88zXqNFv58Hws1WnZBJjE4ScakCl0eKb85GYrzaL5qkjM0FMCRUdS
 32+23FrCToVow1B0MA/c6kub6gJmKK8EDlQGkoqsCizWZFUhgAUFLp1Tt2oWQoTC
 P/vOQWh8zvkw4mWlTAnl8XvVWcUHfq14eV+nCT8BzFRB5BEt6Xvag5IUeFggzITu
 r/xpKfEqnfVYgMl0370r
 =pwKi
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2016-10-21 10:48:58 -07:00
commit e59f30b417
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -9299,7 +9299,7 @@ S: Maintained
F: drivers/pci/host/*designware* F: drivers/pci/host/*designware*
PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE 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 L: linux-pci@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/pci/designware-pcie.txt F: Documentation/devicetree/bindings/pci/designware-pcie.txt

2
drivers/pci/host/pci-layerscape.c
View File

@ -247,6 +247,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
pp = &pcie->pp; pp = &pcie->pp;
pp->dev = dev; pp->dev = dev;
pcie->drvdata = match->data;
pp->ops = pcie->drvdata->ops; pp->ops = pcie->drvdata->ops;
dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); 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); return PTR_ERR(pcie->pp.dbi_base);
} }
pcie->drvdata = match->data;
pcie->lut = pcie->pp.dbi_base + pcie->drvdata->lut_offset; pcie->lut = pcie->pp.dbi_base + pcie->drvdata->lut_offset;
if (!ls_pcie_is_bridge(pcie)) if (!ls_pcie_is_bridge(pcie))

2
drivers/pci/host/pcie-designware-plat.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2015-2016 Synopsys, Inc. (www.synopsys.com) * 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 * 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 * it under the terms of the GNU General Public License version 2 as