diff options
author | Yijing Wang <wangyijing@huawei.com> | 2014-02-11 19:36:51 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-14 12:13:56 -0500 |
commit | 50277c8b06d56f2345e1a0693db46db29fc6d063 (patch) | |
tree | 8593272fd1307dbcd6b0d1f675eec3b12e85b1f4 /drivers/pci/hotplug/pciehp_ctrl.c | |
parent | 50b52fdee050745935d92e7026373edea2647e60 (diff) |
PCI: pciehp: Don't turn slot off when hot-added device already exists
If we found device already exists during hot add device, we should leave
it, not turn the slot off.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_ctrl.c')
-rw-r--r-- | drivers/pci/hotplug/pciehp_ctrl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index fec99a164d93..b4a4ac150e61 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c | |||
@@ -233,7 +233,8 @@ static int board_added(struct slot *p_slot) | |||
233 | if (retval) { | 233 | if (retval) { |
234 | ctrl_err(ctrl, "Cannot add device at %04x:%02x:00\n", | 234 | ctrl_err(ctrl, "Cannot add device at %04x:%02x:00\n", |
235 | pci_domain_nr(parent), parent->number); | 235 | pci_domain_nr(parent), parent->number); |
236 | goto err_exit; | 236 | if (retval != -EEXIST) |
237 | goto err_exit; | ||
237 | } | 238 | } |
238 | 239 | ||
239 | pciehp_green_led_on(p_slot); | 240 | pciehp_green_led_on(p_slot); |