diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-08 14:24:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-08 14:24:51 +0100 |
| commit | 684b6b26af02a58692bb98578ff2653cd60dcb9c (patch) | |
| tree | c60d3f271a0109d3de7d01d7abbb5dcd08c2cdd0 /hw | |
| parent | 47dc0ec576c3d8748985e34d273c8dc0465c5ddb (diff) | |
| parent | 7fc0abf4cb740609e802611690a3cdb7ff5f21bd (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160808' into staging
One more s390x fix for a bug in the pci rework.
# gpg: Signature made Mon 08 Aug 2016 11:49:34 BST
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20160808:
s390x/pci: fix null pointer bug
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390x/s390-pci-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 47ca853bd2..9c1c04e590 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -712,7 +712,7 @@ static void s390_pcihost_hot_unplug(HotplugHandler *hotplug_dev, pci_dev = PCI_DEVICE(dev); for (i = 0 ; i < PCI_SLOT_MAX; i++) { - if (s->pbdev[i]->pdev == pci_dev) { + if (s->pbdev[i] && s->pbdev[i]->pdev == pci_dev) { pbdev = s->pbdev[i]; break; } |