Merge branch 'pci/deletion' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 20 Dec 2013 19:41:18 +0000 (12:41 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 20 Dec 2013 19:41:18 +0000 (12:41 -0700)
commitf72e11123ba122c4ed8fcee52ab57cf3fbe81178
treeb7fa6517acff9c42faa3f314cc5efa72109c80ae
parent9dc1d43ff95152e7ffdf45def855ea6931d95a15
parente75f34ce6633549486a044d64b2a79240d4113a8
Merge branch 'pci/deletion' into next

* pci/deletion:
  PCI/portdrv: Remove extra get_device()/put_device() for pcie_device
  PCI/portdrv: Add put_device() after device_register() failure
  PCI/portdrv: Cleanup error paths
drivers/pci/pcie/portdrv_core.c