diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /drivers/infiniband/hw/mthca/mthca_uar.c | |
| parent | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (diff) | |
| parent | db392219c5f572610645696e3672f6ea38783a65 (diff) | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_uar.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_uar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_uar.c b/drivers/infiniband/hw/mthca/mthca_uar.c index 8e9219842be4..8b728486410d 100644 --- a/drivers/infiniband/hw/mthca/mthca_uar.c +++ b/drivers/infiniband/hw/mthca/mthca_uar.c | |||
| @@ -60,7 +60,7 @@ int mthca_init_uar_table(struct mthca_dev *dev) | |||
| 60 | ret = mthca_alloc_init(&dev->uar_table.alloc, | 60 | ret = mthca_alloc_init(&dev->uar_table.alloc, |
| 61 | dev->limits.num_uars, | 61 | dev->limits.num_uars, |
| 62 | dev->limits.num_uars - 1, | 62 | dev->limits.num_uars - 1, |
| 63 | dev->limits.reserved_uars); | 63 | dev->limits.reserved_uars + 1); |
| 64 | if (ret) | 64 | if (ret) |
| 65 | return ret; | 65 | return ret; |
| 66 | 66 | ||