diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-09-23 14:57:16 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-23 14:57:16 +0200 |
| commit | 0565f49cfe937640c2347f6d7f40ad2f4e4f088b (patch) | |
| tree | 6067447df39c37946bc2de3ee004f45957bf123e /drivers/infiniband/hw/i40iw/i40iw.h | |
| parent | ccf1e9e1c0072088420aad42797986d6e74366b5 (diff) | |
| parent | 9395452b4aab7bc2475ef8935b4a4fb99d778d70 (diff) | |
| download | talos-op-linux-0565f49cfe937640c2347f6d7f40ad2f4e4f088b.tar.gz talos-op-linux-0565f49cfe937640c2347f6d7f40ad2f4e4f088b.zip | |
Merge tag 'v4.8-rc6' into devel
Linux 4.8-rc6
Diffstat (limited to 'drivers/infiniband/hw/i40iw/i40iw.h')
| -rw-r--r-- | drivers/infiniband/hw/i40iw/i40iw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/i40iw/i40iw.h b/drivers/infiniband/hw/i40iw/i40iw.h index b738acdb9b02..8ec09e470f84 100644 --- a/drivers/infiniband/hw/i40iw/i40iw.h +++ b/drivers/infiniband/hw/i40iw/i40iw.h @@ -232,7 +232,7 @@ struct i40iw_device { struct i40e_client *client; struct i40iw_hw hw; struct i40iw_cm_core cm_core; - unsigned long *mem_resources; + u8 *mem_resources; unsigned long *allocated_qps; unsigned long *allocated_cqs; unsigned long *allocated_mrs; @@ -435,8 +435,8 @@ static inline int i40iw_alloc_resource(struct i40iw_device *iwdev, *next = resource_num + 1; if (*next == max_resources) *next = 0; - spin_unlock_irqrestore(&iwdev->resource_lock, flags); *req_resource_num = resource_num; + spin_unlock_irqrestore(&iwdev->resource_lock, flags); return 0; } |
