Explorar o código

[PATCH] powerpc/pseries: bugfix: balance calls to pci_device_put

Repeated calls to eeh_remove_device() can result in multiple
(and thus unbalanced) calls to pci_dev_put(). Make sure the
pci_device_put() is called only once (since there was only
one call to the matching pci_device_get()).

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Linas Vepstas %!s(int64=19) %!d(string=hai) anos
pai
achega
b055a9e10f
Modificáronse 1 ficheiros con 4 adicións e 2 borrados
  1. 4 2
      arch/powerpc/platforms/pseries/eeh.c

+ 4 - 2
arch/powerpc/platforms/pseries/eeh.c

@@ -957,8 +957,10 @@ static void eeh_remove_device(struct pci_dev *dev)
 	pci_addr_cache_remove_device(dev);
 	pci_addr_cache_remove_device(dev);
 
 
 	dn = pci_device_to_OF_node(dev);
 	dn = pci_device_to_OF_node(dev);
-	PCI_DN(dn)->pcidev = NULL;
-	pci_dev_put (dev);
+	if (PCI_DN(dn)->pcidev) {
+		PCI_DN(dn)->pcidev = NULL;
+		pci_dev_put (dev);
+	}
 }
 }
 
 
 void eeh_remove_bus_device(struct pci_dev *dev)
 void eeh_remove_bus_device(struct pci_dev *dev)