diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 16:02:50 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 16:02:50 -0800 |
commit | 34f2c1c35ff014a5d145971e41caa940cd62d563 (patch) | |
tree | 041f87086c9b2d2db384a791d460f8f985a0ba5e /drivers/pci/pcie/portdrv_pci.c | |
parent | cae2f9c46d69edb1aee565917735d79aba3a3267 (diff) | |
parent | 26e6c66e47fe7f69ef6ddb078e312204a1f17823 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
pci hotplug: kernel-doc fixes
pci-aer: fix kernel-doc mistakes
PCI: drivers/pci/pci-sysfs.c: Add missing pci_dev_put
PCI: pcie portdriver: initialize returned value
Diffstat (limited to 'drivers/pci/pcie/portdrv_pci.c')
-rw-r--r-- | drivers/pci/pcie/portdrv_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index df383645e36..26057f98f72 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c @@ -217,7 +217,7 @@ static int slot_reset_iter(struct device *device, void *data) static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev) { - pci_ers_result_t status; + pci_ers_result_t status = PCI_ERS_RESULT_NONE; int retval; /* If fatal, restore cfg space for possible link reset at upstream */ |