Explorar el Código

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>
Yijing Wang hace 11 años
padre
commit
50277c8b06
Se han modificado 2 ficheros con 3 adiciones y 2 borrados
  1. 2 1
      drivers/pci/hotplug/pciehp_ctrl.c
  2. 1 1
      drivers/pci/hotplug/pciehp_pci.c

+ 2 - 1
drivers/pci/hotplug/pciehp_ctrl.c

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

+ 1 - 1
drivers/pci/hotplug/pciehp_pci.c

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