Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-04-03 14:25:36 +0200
committerTakashi Iwai <tiwai@suse.de>2017-04-03 14:25:36 +0200
commit40f984a960152ad4d6c4a0965bc7bca9f0a26283 (patch)
treeec3092fb57f7adab423595bf22869aefcad1df03
parentcdd77bd49726fe58b773c6610c461251c89b1333 (diff)
parenta329c33d42d34c6eca91b68e2ac955d727c56aaa (diff)
Merge branch 'users/hare/SLE12-SP3/for-next' into SLE12-SP3rpm-4.4.59-1
Pull IB fix from Hannes Reinecke (bsc#1024474). suse-commit: 824b24530ab461b2fd0a7b2d768f2d35d91fa8f9
-rw-r--r--drivers/infiniband/core/verbs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index f7deaef6e488..e846c81b21f8 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -829,7 +829,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd,
if (ret) {
pr_err("failed to init MR pool ret= %d\n", ret);
ib_destroy_qp(qp);
- qp = ERR_PTR(ret);
+ return ERR_PTR(ret);
}
}