summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2013-12-12 17:50:53 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-12-16 14:37:54 +0100
commit704268925d32a0457202371a61580af76b94c53a (patch)
tree0b6046705766ce3ed9da2d14a561da9f93cbfb20
parentaa3b7c296732b4351dfdbfe70be6b38a0882be14 (diff)
downloadlinux-704268925d32a0457202371a61580af76b94c53a.tar.gz
linux-704268925d32a0457202371a61580af76b94c53a.tar.bz2
linux-704268925d32a0457202371a61580af76b94c53a.zip
s390/pci: fix removal of nonexistent pci bus
If we remove a pci bus after receiving a hotplug notification we need to check if the bus is actually present (creation of the pci bus during an earlier notification may have been failed). Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/pci/pci_event.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c
index 228787a3630a..65ea105f68a1 100644
--- a/arch/s390/pci/pci_event.c
+++ b/arch/s390/pci/pci_event.c
@@ -112,6 +112,8 @@ static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf)
clp_rescan_pci_devices();
break;
case 0x0308: /* Standby -> Reserved */
+ if (!zdev)
+ break;
pci_stop_root_bus(zdev->bus);
pci_remove_root_bus(zdev->bus);
break;