From e8bc2f17d5acbcb5af621ada69aa2f2f78cd2eb4 Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Mon, 21 Jan 2013 13:20:46 -0800 Subject: [PATCH] --- yaml --- r: 358412 b: refs/heads/master c: e723f0b4f4ecaf3fdd542124b3f99379ab8df757 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/probe.c | 1 - trunk/drivers/pci/remove.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 939a8f1906d5..d15dd0da08fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5af7d987a494a1b85e176b4c33dc115cb111662 +refs/heads/master: e723f0b4f4ecaf3fdd542124b3f99379ab8df757 diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index b97dea5784ff..48b35e15374d 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/drivers/pci/probe.c @@ -1298,7 +1298,6 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) { device_initialize(&dev->dev); dev->dev.release = pci_release_dev; - pci_dev_get(dev); set_dev_node(&dev->dev, pcibus_to_node(bus)); dev->dev.dma_mask = &dev->dma_mask; diff --git a/trunk/drivers/pci/remove.c b/trunk/drivers/pci/remove.c index 7c0fd9252e6f..fc38c4883e1d 100644 --- a/trunk/drivers/pci/remove.c +++ b/trunk/drivers/pci/remove.c @@ -22,7 +22,7 @@ static void pci_stop_dev(struct pci_dev *dev) if (dev->is_added) { pci_proc_detach_device(dev); pci_remove_sysfs_dev_files(dev); - device_unregister(&dev->dev); + device_del(&dev->dev); dev->is_added = 0; } @@ -37,7 +37,7 @@ static void pci_destroy_dev(struct pci_dev *dev) up_write(&pci_bus_sem); pci_free_resources(dev); - pci_dev_put(dev); + put_device(&dev->dev); } void pci_remove_bus(struct pci_bus *bus)