| commit | d53e181c85effdfdec97a760622330626c922d81 | [log] [tgz] |
|---|---|---|
| author | Doug Ledford <dledford@redhat.com> | Thu Apr 28 15:16:21 2016 -0400 |
| committer | Doug Ledford <dledford@redhat.com> | Thu Apr 28 15:16:21 2016 -0400 |
| tree | 9df58cc9a8dd4c752cdc6f11604787a48a8e1238 | |
| parent | d29c9ab1a2c81ce404883baba91e15ae35411900 [diff] | |
| parent | b75a2bf899b668b1d52de8846aafdbcf81349c73 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into testing/4.6
diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c index cb00d59..c2e257d 100644 --- a/drivers/infiniband/core/cache.c +++ b/drivers/infiniband/core/cache.c
@@ -691,7 +691,8 @@ NULL); /* Coudn't find default GID location */ - WARN_ON(ix < 0); + if (WARN_ON(ix < 0)) + goto release; zattr_type.gid_type = gid_type;