From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Thu, 12 Dec 2013 16:50:53 +0000 (+0100)
Subject: s390/pci: fix removal of nonexistent pci bus
X-Git-Tag: next-20131220~90^2~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=704268925d32a0457202371a61580af76b94c53a;p=karo-tx-linux.git

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>
---

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;