diff options
| author | Kenji Kaneshige | 2007-12-20 11:43:56 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2008-02-02 00:04:28 +0100 |
| commit | 8bb7c7af1ff2a9e9e0936dbdd15901c80329c7af (patch) | |
| tree | 0368c41b8cec3b8f4498568abc4e593e8c2ec49b /drivers | |
| parent | PCI: Remove pci_enable_device_bars() from documentation (diff) | |
| download | kernel-qcow2-linux-8bb7c7af1ff2a9e9e0936dbdd15901c80329c7af.tar.gz kernel-qcow2-linux-8bb7c7af1ff2a9e9e0936dbdd15901c80329c7af.tar.xz kernel-qcow2-linux-8bb7c7af1ff2a9e9e0936dbdd15901c80329c7af.zip | |
pciehp: wait for 1000ms before LED operation after power off
After turning power off, we must wait for at least 1 second *before*
LED operation.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_ctrl.c | 12 | ||||
| -rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 7 |
2 files changed, 7 insertions, 12 deletions
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 4cb2c623e17b..b23061c56115 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c @@ -195,12 +195,6 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot) __FUNCTION__); return; } - /* - * After turning power off, we must wait for at least - * 1 second before taking any action that relies on - * power having been removed from the slot/adapter. - */ - msleep(1000); } } @@ -610,12 +604,6 @@ int pciehp_disable_slot(struct slot *p_slot) mutex_unlock(&p_slot->ctrl->crit_sect); return -EINVAL; } - /* - * After turning power off, we must wait for at least - * 1 second before taking any action that relies on - * power having been removed from the slot/adapter. - */ - msleep(1000); } ret = remove_board(p_slot); diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 8c2d6c9b92c5..b2cde04ede1a 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -674,6 +674,13 @@ static int hpc_power_off_slot(struct slot * slot) dbg("%s: SLOTCTRL %x write cmd %x\n", __FUNCTION__, ctrl->cap_base + SLOTCTRL, slot_cmd); + /* + * After turning power off, we must wait for at least 1 second + * before taking any action that relies on power having been + * removed from the slot/adapter. + */ + msleep(1000); + return retval; } |