| commit | 1e3474d1de922ea3df176a0efbef843ada2dd43b | [log] [tgz] |
|---|---|---|
| author | Roland Dreier <roland@purestorage.com> | Tue Oct 23 09:03:49 2012 -0700 |
| committer | Roland Dreier <roland@purestorage.com> | Tue Oct 23 09:03:49 2012 -0700 |
| tree | 2580a2ef5a333d4c6220e0fec5402d91f972e218 | |
| parent | 32c631f9f2566d09d32abc2f4c7aa24c6d8b5641 [diff] | |
| parent | 41929ed2656bab8af1734bf5d0088385e72e294f [diff] |
Merge branches 'cxgb4' and 'mlx4' into for-next
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c index 57e07c6..afd8179 100644 --- a/drivers/infiniband/hw/cxgb4/mem.c +++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -468,7 +468,7 @@ ret = alloc_pbl(mhp, npages); if (ret) { kfree(page_list); - goto err_pbl; + goto err; } ret = write_pbl(&mhp->rhp->rdev, page_list, mhp->attr.pbl_addr,