diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-18 09:28:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-18 09:28:03 +0100 |
| commit | 3a2f2ac9b96f9a9f5538396a212d3b9fb543bfc5 (patch) | |
| tree | 294c2f340b11584e58cea90adfc4182ac8742348 /arch/mips/pci/pci-mt7620.c | |
| parent | x86/entry/compat: Keep TS_COMPAT set during signal delivery (diff) | |
| parent | x86/mm: Fix vmalloc_fault() to handle large pages properly (diff) | |
| download | linux-3a2f2ac9b96f9a9f5538396a212d3b9fb543bfc5.tar.xz linux-3a2f2ac9b96f9a9f5538396a212d3b9fb543bfc5.zip | |
Merge branch 'x86/urgent' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/pci/pci-mt7620.c')
| -rw-r--r-- | arch/mips/pci/pci-mt7620.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/pci/pci-mt7620.c b/arch/mips/pci/pci-mt7620.c index a009ee458934..1ae932c2d78b 100644 --- a/arch/mips/pci/pci-mt7620.c +++ b/arch/mips/pci/pci-mt7620.c @@ -297,12 +297,12 @@ static int mt7620_pci_probe(struct platform_device *pdev) return PTR_ERR(rstpcie0); bridge_base = devm_ioremap_resource(&pdev->dev, bridge_res); - if (!bridge_base) - return -ENOMEM; + if (IS_ERR(bridge_base)) + return PTR_ERR(bridge_base); pcie_base = devm_ioremap_resource(&pdev->dev, pcie_res); - if (!pcie_base) - return -ENOMEM; + if (IS_ERR(pcie_base)) + return PTR_ERR(pcie_base); iomem_resource.start = 0; iomem_resource.end = ~0; |