From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 14 Jun 2013 23:47:46 +0000 (-0600)
Subject: Merge branch 'pci/jiang-bus-lock-v3' into next
X-Git-Tag: firefly_0821_release~176^2~5787^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=df58f46c0f2a1d69268b734ac25c87ffb7aeb32a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/jiang-bus-lock-v3' into next

* pci/jiang-bus-lock-v3:
  PCI: Return early on allocation failures to unindent mainline code
  PCI: Simplify IOV implementation and fix reference count races
  PCI: Drop redundant setting of bus->is_added in virtfn_add_bus()
  unicore32/PCI: Remove redundant call of pci_bus_add_devices()
  m68k/PCI: Remove redundant call of pci_bus_add_devices()
  PCI: Rename pci_release_bus_bridge_dev() to pci_release_host_bridge_dev()
  PCI: Fix refcount issue in pci_create_root_bus() error recovery path
  ia64/PCI: Clean up pci_scan_root_bus() usage
  PCI: Convert alloc_pci_dev(void) to pci_alloc_dev(bus)
  PCI: Introduce pci_alloc_dev(struct pci_bus*) to replace alloc_pci_dev()
  PCI: Introduce pci_bus_{get|put}() to manage PCI bus reference count

Conflicts:
	drivers/pci/probe.c
---

df58f46c0f2a1d69268b734ac25c87ffb7aeb32a
diff --cc drivers/pci/probe.c
index d0c33aac768e,14af6ef4959c..46ada5c098eb
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -1151,7 -1145,7 +1164,8 @@@ static void pci_release_dev(struct devi
  	pci_dev = to_pci_dev(dev);
  	pci_release_capabilities(pci_dev);
  	pci_release_of_node(pci_dev);
 +	pcibios_release_device(pci_dev);
+ 	pci_bus_put(pci_dev->bus);
  	kfree(pci_dev);
  }