diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:37:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:37:10 -0800 |
| commit | 12f981f9028da2402c236544c78b8378a278f830 (patch) | |
| tree | 7983fdf95d77ad241e09db861bb90a629eee753f /drivers/pci/hotplug/pciehp_hpc.c | |
| parent | 10955d2251387df3997d8b9b6c572dfad9f23dd0 (diff) | |
| parent | c1ef5cbd03921047c2eafb998132e562043678a7 (diff) | |
| download | linux-12f981f9028da2402c236544c78b8378a278f830.tar.bz2 | |
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: pciehp: fix error code path in hpc_power_off_slot
PCI: Add DECLARE_PCI_DEVICE_TABLE macro
PCI: fix up error messages for pci_bus registering
PCI: fix section mismatch warning in pci_scan_child_bus
PCI: consolidate duplicated MSI enable functions
PCI: use dev_printk in quirk messages
Diffstat (limited to 'drivers/pci/hotplug/pciehp_hpc.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 6eba9b2cfb90..698975a6a21c 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -711,7 +711,8 @@ static int hpc_power_off_slot(struct slot * slot) retval = pcie_write_cmd(slot, slot_cmd, cmd_mask); if (retval) { err("%s: Write command failed!\n", __FUNCTION__); - return -1; + retval = -1; + goto out; } dbg("%s: SLOTCTRL %x write cmd %x\n", __FUNCTION__, ctrl->cap_base + SLOTCTRL, slot_cmd); @@ -722,7 +723,7 @@ static int hpc_power_off_slot(struct slot * slot) * removed from the slot/adapter. */ msleep(1000); - + out: if (changed) pcie_unmask_bad_dllp(ctrl); |