Mutliple removing via /sys will call pci_destroy_dev two times.
Add is_removed to record if pci_destroy_dev is called already.
During second calling, still have extra dev ref hold via
device_schedule_call, so we are safe to check dev->is_removed.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
---
drivers/pci/remove.c | 5 ++++-
include/linux/pci.h | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 0d2c36f..cffe269 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -20,7 +20,10 @@ static void pci_stop_dev(struct pci_dev *dev)
static void pci_destroy_dev(struct pci_dev *dev)
{
- put_device(&dev->dev);
+ if (!dev->is_removed) {
+ dev->is_removed = 1;
+ put_device(&dev->dev);
+ }
}
void pci_remove_bus(struct pci_bus *bus)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1084a15..ccb316d 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -321,6 +321,7 @@ struct pci_dev {
unsigned int multifunction:1;/* Part of multi-function device */
/* keep track of device state */
unsigned int is_added:1;
+ unsigned int is_removed:1; /* pci_destroy_dev is called */
unsigned int is_busmaster:1; /* device is busmaster */
unsigned int no_msi:1; /* device may not use msi */
unsigned int block_cfg_access:1; /* config space access is blocked */
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
