diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 391a811ba3445fafc3209a557f3f3326353ba655..fcc997cbf8438ac87f36655459c0297777fd8bf6 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -470,7 +470,8 @@ static ssize_t remove_store(struct device *dev, struct device_attribute *attr,
 			    const char *buf, size_t count)
 {
 	unsigned long val;
-	struct pci_dev *rpdev = to_pci_dev(dev)->rpdev;
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct pci_dev *rpdev = pdev->rpdev;
 
 	if (kstrtoul(buf, 0, &val) < 0)
 		return -EINVAL;
@@ -490,8 +491,12 @@ static ssize_t remove_store(struct device *dev, struct device_attribute *attr,
 	if (rpdev)
 		pci_dev_get(rpdev);
 
-	if (val && device_remove_file_self(dev, attr))
-		pci_stop_and_remove_bus_device_locked(to_pci_dev(dev));
+	if (val) {
+		pci_dev_get(pdev);
+		if (device_remove_file_self(dev, attr))
+			pci_stop_and_remove_bus_device_locked(pdev);
+		pci_dev_put(pdev);
+	}
 
 	if (rpdev) {
 		clear_bit(0, &rpdev->slot_being_removed_rescanned);