diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-06 11:08:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-06 11:08:20 +0100 |
| commit | 32de5d0e850682c07b172b086cd1562cb350a8ea (patch) | |
| tree | 212060407bec8257ebd89992f170917c5ea58d60 /arch/powerpc | |
| parent | 68e9a7c161360ecaa4596b1bff69b5bec4c2487f (diff) | |
| parent | 8e952ae717dea59aa8104421dc4d3b9e66981c7d (diff) | |
Merge tag 'v3.14.18' into linux-linaro-lsk-v3.14
This is the 3.14.18 stable release
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/powernv/pci-ioda.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/pseries/pci_dlpar.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 3b2b4fb3585b..beedaf0c5e75 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -491,6 +491,7 @@ static int pnv_pci_ioda_dma_set_mask(struct pnv_phb *phb, set_dma_ops(&pdev->dev, &dma_iommu_ops); set_iommu_table_base(&pdev->dev, &pe->tce32_table); } + *pdev->dev.dma_mask = dma_mask; return 0; } diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c index efe61374f6ea..e68922b0d4f5 100644 --- a/arch/powerpc/platforms/pseries/pci_dlpar.c +++ b/arch/powerpc/platforms/pseries/pci_dlpar.c @@ -118,10 +118,10 @@ int remove_phb_dynamic(struct pci_controller *phb) } } - /* Unregister the bridge device from sysfs and remove the PCI bus */ - device_unregister(b->bridge); + /* Remove the PCI bus and unregister the bridge device from sysfs */ phb->bus = NULL; pci_remove_bus(b); + device_unregister(b->bridge); /* Now release the IO resource */ if (res->flags & IORESOURCE_IO) |