diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-03-28 10:34:19 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-03-28 10:34:19 +0300 |
| commit | e5c1ff14757afe21733ddee9cc4bbaeaeadbf803 (patch) | |
| tree | 0da1c9aaf772fac30fe68590a4ca1c3dd439cebd /drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | |
| parent | 65d1086c44791112188f6aebbdc3a27cab3736d3 (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| download | linux-e5c1ff14757afe21733ddee9cc4bbaeaeadbf803.tar.xz | |
Backmerge tag 'v4.11-rc4' into drm-next
Linux 4.11-rc4
The i915 GVT team need the rc4 code to base some more code on.
Diffstat (limited to 'drivers/infiniband/hw/ocrdma/ocrdma_verbs.c')
| -rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index bc9fb144e57b..c52edeafd616 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -372,7 +372,7 @@ static int _ocrdma_pd_mgr_put_bitmap(struct ocrdma_dev *dev, u16 pd_id, return 0; } -static u8 ocrdma_put_pd_num(struct ocrdma_dev *dev, u16 pd_id, +static int ocrdma_put_pd_num(struct ocrdma_dev *dev, u16 pd_id, bool dpp_pool) { int status; |