From 79348b549056773a6223fa31162ba0b273803389 Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Fri, 29 Feb 2008 11:09:31 +0100 Subject: [PATCH] --- yaml --- r: 86912 b: refs/heads/master c: dc63644b0ee3b447e879ef8e124657b40e9ea81c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ssb/driver_pcicore.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 62774d104d48..401700acc56c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d60ab0574fae362b1cca0ef52181ef75fd46832 +refs/heads/master: dc63644b0ee3b447e879ef8e124657b40e9ea81c diff --git a/trunk/drivers/ssb/driver_pcicore.c b/trunk/drivers/ssb/driver_pcicore.c index 07ab48d9ceab..74b9a8aea52b 100644 --- a/trunk/drivers/ssb/driver_pcicore.c +++ b/trunk/drivers/ssb/driver_pcicore.c @@ -111,7 +111,10 @@ static void __init ssb_fixup_pcibridge(struct pci_dev *dev) /* Enable PCI bridge bus mastering and memory space */ pci_set_master(dev); - pcibios_enable_device(dev, ~0); + if (pcibios_enable_device(dev, ~0) < 0) { + ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n"); + return; + } /* Enable PCI bridge BAR1 prefetch and burst */ pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3);