diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-22 08:21:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-22 08:21:48 -0700 |
| commit | f7edd5fbde8af44fa06218f56e0f648fc7a527c8 (patch) | |
| tree | 1c44c189813d678d700b8f3e1b94b16a70de7a0b /drivers/infiniband/hw/ipath/ipath_iba7220.c | |
| parent | a22c50c302c58ba2d1d2846e85239ba80da61a56 (diff) | |
| parent | 45dd75d83cef8c4e4a8d78bc8ed072a01196d30c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IPoIB: Fix deadlock on RTNL in ipoib_stop()
IB/ipath: Fix incorrect check for max physical address in TID
IB/ipath: Fix lost UD send work request
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_iba7220.c')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba7220.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_iba7220.c b/drivers/infiniband/hw/ipath/ipath_iba7220.c index d90f5e9a54fa..9839e20119bc 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba7220.c +++ b/drivers/infiniband/hw/ipath/ipath_iba7220.c @@ -1720,7 +1720,7 @@ static void ipath_7220_put_tid(struct ipath_devdata *dd, u64 __iomem *tidptr, "not 2KB aligned!\n", pa); return; } - if (pa >= (1UL << IBA7220_TID_SZ_SHIFT)) { + if (chippa >= (1UL << IBA7220_TID_SZ_SHIFT)) { ipath_dev_err(dd, "BUG: Physical page address 0x%lx " "larger than supported\n", pa); |