diff options
| author | Wei Yongjun <weiyj.lk@gmail.com> | 2016-08-06 01:01:24 (GMT) |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-08-22 18:13:18 (GMT) |
| commit | 204f69ba64122b1ee6732bab8cfd71fe2d68c188 (patch) | |
| tree | 31ec7a3b93beade356d8981b543d9ae32a99de9e /drivers/infiniband | |
| parent | 66a9bae67b98cf1df384bd86bb5ffa07ade1937a (diff) | |
| download | linux-204f69ba64122b1ee6732bab8cfd71fe2d68c188.tar.xz | |
IB/hns: Fix return value check in hns_roce_get_cfg()
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 <weiyj.lk@gmail.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/hns/hns_roce_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c index 5b42ec8..6ead671 100644 --- a/drivers/infiniband/hw/hns/hns_roce_main.c +++ b/drivers/infiniband/hw/hns/hns_roce_main.c @@ -715,8 +715,8 @@ static int hns_roce_get_cfg(struct hns_roce_dev *hr_dev) res = platform_get_resource(hr_dev->pdev, IORESOURCE_MEM, 0); hr_dev->reg_base = devm_ioremap_resource(dev, res); - if (!hr_dev->reg_base) - return -ENOMEM; + if (IS_ERR(hr_dev->reg_base)) + return PTR_ERR(hr_dev->reg_base); for (i = 0; i < HNS_ROCE_MAX_PORTS; i++) { net_node = of_parse_phandle(np, "eth-handle", i); |