Commit d4988623cc60 ("IB/qib: use arch_phys_wc_add()")
adjusted mtrr inititialization to use the new interface.Unfortunately, the new interface returns a signed value and the patch tested the unsigned wc_cookie. Fix the issue by using 'ret' and only assigning wc_cookie from ret when ret >= 0. Additionally, insure ret is 0 on success. Signed-off-by: Mike Marciniszyn <[email protected]> --- drivers/infiniband/hw/qib/qib_wc_x86_64.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/hw/qib/qib_wc_x86_64.c b/drivers/infiniband/hw/qib/qib_wc_x86_64.c index 6d61ef9..85525be 100644 --- a/drivers/infiniband/hw/qib/qib_wc_x86_64.c +++ b/drivers/infiniband/hw/qib/qib_wc_x86_64.c @@ -116,9 +116,11 @@ int qib_enable_wc(struct qib_devdata *dd) } if (!ret) { - dd->wc_cookie = arch_phys_wc_add(pioaddr, piolen); - if (dd->wc_cookie < 0) - ret = -EINVAL; + ret = arch_phys_wc_add(pioaddr, piolen); + if (ret >= 0) { + dd->wc_cookie = ret; + ret = 0; + } } return ret; -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
