diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 16:31:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 16:31:54 -0800 |
| commit | ba77df570c6710c9c19b31e0e48e4bcdf31cefe8 (patch) | |
| tree | 997c210135b5578982df256dd5a0140e04d972d1 /drivers/infiniband/hw/mthca/mthca_profile.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff) | |
| parent | [IB] mthca: check P_Key index in modify QP (diff) | |
| download | linux-dev-ba77df570c6710c9c19b31e0e48e4bcdf31cefe8.tar.xz linux-dev-ba77df570c6710c9c19b31e0e48e4bcdf31cefe8.zip | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_profile.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_profile.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_profile.c b/drivers/infiniband/hw/mthca/mthca_profile.c index bd1338682074..08a909371b0a 100644 --- a/drivers/infiniband/hw/mthca/mthca_profile.c +++ b/drivers/infiniband/hw/mthca/mthca_profile.c @@ -82,12 +82,10 @@ u64 mthca_make_profile(struct mthca_dev *dev, struct mthca_resource tmp; int i, j; - profile = kmalloc(MTHCA_RES_NUM * sizeof *profile, GFP_KERNEL); + profile = kzalloc(MTHCA_RES_NUM * sizeof *profile, GFP_KERNEL); if (!profile) return -ENOMEM; - memset(profile, 0, MTHCA_RES_NUM * sizeof *profile); - profile[MTHCA_RES_QP].size = dev_lim->qpc_entry_sz; profile[MTHCA_RES_EEC].size = dev_lim->eec_entry_sz; profile[MTHCA_RES_SRQ].size = dev_lim->srq_entry_sz; |