diff options
| author | Gavin Shan | 2014-11-12 03:36:05 +0100 |
|---|---|---|
| committer | Michael Ellerman | 2014-11-14 07:24:22 +0100 |
| commit | 9e9e8935215d164cea2f49a7679cc0663c2253b6 (patch) | |
| tree | f67928c8d124c852506732a2958f8f6ec3d6da49 /arch/powerpc/platforms | |
| parent | powerpc/powernv: Check PHB type in advance (diff) | |
| download | kernel-qcow2-linux-9e9e8935215d164cea2f49a7679cc0663c2253b6.tar.gz kernel-qcow2-linux-9e9e8935215d164cea2f49a7679cc0663c2253b6.tar.xz kernel-qcow2-linux-9e9e8935215d164cea2f49a7679cc0663c2253b6.zip | |
powerpc/powernv: Fix condition to remove M64
The M64 resource should be removed if we don't have hook to
initialize it, or (not and) fail to do that.
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powernv/pci-ioda.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 7ab1dd732993..7aa040441c08 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -2000,8 +2000,8 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np, ioda_eeh_phb_reset(hose, OPAL_DEASSERT_RESET); } - /* Configure M64 window */ - if (phb->init_m64 && phb->init_m64(phb)) + /* Remove M64 resource if we can't configure it successfully */ + if (!phb->init_m64 || phb->init_m64(phb)) hose->mem_resources[1].flags = 0; } |