From a4d3abb36686fd8b83be5bc7267164c37b8ed5df Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 13 Sep 2011 15:16:33 -0300 Subject: [PATCH] --- yaml --- r: 263779 b: refs/heads/master c: 1a4b1a41b8a3d5256019854e851beed063b34344 h: refs/heads/master i: 263777: 89e0c186017c6b60688a44538577c2909f13dd93 263775: 07b2892cbe793b41c0b87013175f034acfa5b977 v: v3 --- [refs] | 2 +- trunk/drivers/pci/probe.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f7c3f77d2339..8ef3ad620d11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f4d3218e95d48de2951dcf2bea619ea49ef93de +refs/heads/master: 1a4b1a41b8a3d5256019854e851beed063b34344 diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index b1187ff31d89..f3f94a5c068f 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/drivers/pci/probe.c @@ -1351,7 +1351,8 @@ static int pcie_find_smpss(struct pci_dev *dev, void *data) * will occur as normal. */ if (dev->is_hotplug_bridge && (!list_is_singular(&dev->bus->devices) || - dev->bus->self->pcie_type != PCI_EXP_TYPE_ROOT_PORT)) + (dev->bus->self && + dev->bus->self->pcie_type != PCI_EXP_TYPE_ROOT_PORT))) *smpss = 0; if (*smpss > dev->pcie_mpss)