diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:14:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:14:57 +0100 |
| commit | 9884afa2fdce71cd35bb79303f9050f0d76e3d03 (patch) | |
| tree | e4bd1187eee271fd93b8a99c5a951afaa53c4d80 /drivers/infiniband/core/sa_query.c | |
| parent | fbfcd0199170984bd3c2812e49ed0fe7b226959a (diff) | |
| parent | 0c8efd610b58cb23cefdfa12015799079aef94ae (diff) | |
Merge tag 'v4.16-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/core/sa_query.c')
| -rw-r--r-- | drivers/infiniband/core/sa_query.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c index 8cf15d4a8ac4..9f029a1ca5ea 100644 --- a/drivers/infiniband/core/sa_query.c +++ b/drivers/infiniband/core/sa_query.c @@ -1291,10 +1291,9 @@ int ib_init_ah_attr_from_path(struct ib_device *device, u8 port_num, resolved_dev = dev_get_by_index(dev_addr.net, dev_addr.bound_dev_if); - if (resolved_dev->flags & IFF_LOOPBACK) { - dev_put(resolved_dev); - resolved_dev = idev; - dev_hold(resolved_dev); + if (!resolved_dev) { + dev_put(idev); + return -ENODEV; } ndev = ib_get_ndev_from_path(rec); rcu_read_lock(); |