diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-11-18 22:40:28 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-07 17:44:32 -0500 |
commit | c176d1c71bd18238e5d77d6acc6b991aa6a17f3b (patch) | |
tree | f6e2fa1335ece088d69b375632f9ea2f59026782 | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) |
PCI: rcar: Fix rcar_pci_probe() return value check
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
-rw-r--r-- | drivers/pci/host/pci-rcar-gen2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index cbaa5c4397e3..96d118242ae2 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c | |||
@@ -276,8 +276,8 @@ static int __init rcar_pci_probe(struct platform_device *pdev) | |||
276 | 276 | ||
277 | cfg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 277 | cfg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
278 | reg = devm_ioremap_resource(&pdev->dev, cfg_res); | 278 | reg = devm_ioremap_resource(&pdev->dev, cfg_res); |
279 | if (!reg) | 279 | if (IS_ERR(reg)) |
280 | return -ENODEV; | 280 | return PTR_ERR(reg); |
281 | 281 | ||
282 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 282 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
283 | if (!mem_res || !mem_res->start) | 283 | if (!mem_res || !mem_res->start) |