From ec49fe8ee1db5f4e04fd412390b787e6fb6e27e8 Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Thu, 2 Aug 2007 01:41:13 +1000 Subject: [PATCH] --- yaml --- r: 63658 b: refs/heads/master c: 3a77d291be53fbc619f14a6199b9b4cac036c476 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci_32.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ef33463c6022..5deed8acaa9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9c3fdb0f0fe02ba33e87ef947f23cd12e6196fe +refs/heads/master: 3a77d291be53fbc619f14a6199b9b4cac036c476 diff --git a/trunk/arch/powerpc/kernel/pci_32.c b/trunk/arch/powerpc/kernel/pci_32.c index cd35c969bb28..04a3109ae3c6 100644 --- a/trunk/arch/powerpc/kernel/pci_32.c +++ b/trunk/arch/powerpc/kernel/pci_32.c @@ -581,8 +581,11 @@ pcibios_assign_resources(void) if ((r->flags & IORESOURCE_UNSET) && r->end && (!ppc_md.pcibios_enable_device_hook || !ppc_md.pcibios_enable_device_hook(dev, 1))) { + int rc; + r->flags &= ~IORESOURCE_UNSET; - pci_assign_resource(dev, idx); + rc = pci_assign_resource(dev, idx); + BUG_ON(rc); } }