iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: pciehp: Don't turn slot off when hot-added device already exists

Browse Source 
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>
This commit is contained in:
Yijing Wang 2014-02-11 17:36:51 -07:00 committed by Bjorn Helgaas
parent 50b52fdee0
commit 50277c8b06
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/pci/hotplug/pciehp_ctrl.c
View File

@ -233,7 +233,8 @@ static int board_added(struct slot *p_slot)
if (retval) { if (retval) {
ctrl_err(ctrl, "Cannot add device at %04x:%02x:00\n", ctrl_err(ctrl, "Cannot add device at %04x:%02x:00\n",
pci_domain_nr(parent), parent->number); pci_domain_nr(parent), parent->number);
goto err_exit; if (retval != -EEXIST)
goto err_exit;
} }
pciehp_green_led_on(p_slot); pciehp_green_led_on(p_slot);

2
drivers/pci/hotplug/pciehp_pci.c
View File

@ -50,7 +50,7 @@ int pciehp_configure_device(struct slot *p_slot)
"at %04x:%02x:00, cannot hot-add\n", pci_name(dev), "at %04x:%02x:00, cannot hot-add\n", pci_name(dev),
pci_domain_nr(parent), parent->number); pci_domain_nr(parent), parent->number);
pci_dev_put(dev); pci_dev_put(dev);
ret = -EINVAL; ret = -EEXIST;
goto out; goto out;
} }