redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

IB/qib: fix test of unsigned variable 

Commit d4988623cc ("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 changing the type of wc_cookie to int.  For
the success case the ret left at zero to avoid
a warning from the caller.  For failure wc_cookie
is used as the ret.

Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
hifive-unleashed-5.1
Mike Marciniszyn 2015-05-12 13:42:42 -04:00 committed by Doug Ledford
parent ec04847c0c
commit ec40f925e0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/hw/qib/qib.h
View File

@ -903,7 +903,7 @@ struct qib_devdata {
/* PCI Device ID (here for NodeInfo) */
u16 deviceid;
/* for write combining settings */
unsigned long wc_cookie;
int wc_cookie;
unsigned long wc_base;
unsigned long wc_len;

3
drivers/infiniband/hw/qib/qib_wc_x86_64.c
View File

@ -118,7 +118,8 @@ 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;
/* use error from routine */
ret = dd->wc_cookie;
}
return ret;