diff options
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_init.c')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_init.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c index 738269b46d83..9f62546a3eac 100644 --- a/drivers/infiniband/hw/qib/qib_init.c +++ b/drivers/infiniband/hw/qib/qib_init.c | |||
@@ -140,7 +140,7 @@ int qib_create_ctxts(struct qib_devdata *dd) | |||
140 | * Allocate full ctxtcnt array, rather than just cfgctxts, because | 140 | * Allocate full ctxtcnt array, rather than just cfgctxts, because |
141 | * cleanup iterates across all possible ctxts. | 141 | * cleanup iterates across all possible ctxts. |
142 | */ | 142 | */ |
143 | dd->rcd = kzalloc(sizeof(*dd->rcd) * dd->ctxtcnt, GFP_KERNEL); | 143 | dd->rcd = kcalloc(dd->ctxtcnt, sizeof(*dd->rcd), GFP_KERNEL); |
144 | if (!dd->rcd) { | 144 | if (!dd->rcd) { |
145 | qib_dev_err(dd, | 145 | qib_dev_err(dd, |
146 | "Unable to allocate ctxtdata array, failing\n"); | 146 | "Unable to allocate ctxtdata array, failing\n"); |
@@ -1025,8 +1025,7 @@ static void qib_verify_pioperf(struct qib_devdata *dd) | |||
1025 | addr = vmalloc(cnt); | 1025 | addr = vmalloc(cnt); |
1026 | if (!addr) { | 1026 | if (!addr) { |
1027 | qib_devinfo(dd->pcidev, | 1027 | qib_devinfo(dd->pcidev, |
1028 | "Couldn't get memory for checking PIO perf," | 1028 | "Couldn't get memory for checking PIO perf, skipping\n"); |
1029 | " skipping\n"); | ||
1030 | goto done; | 1029 | goto done; |
1031 | } | 1030 | } |
1032 | 1031 | ||
@@ -1178,7 +1177,7 @@ bail: | |||
1178 | if (!list_empty(&dd->list)) | 1177 | if (!list_empty(&dd->list)) |
1179 | list_del_init(&dd->list); | 1178 | list_del_init(&dd->list); |
1180 | ib_dealloc_device(&dd->verbs_dev.ibdev); | 1179 | ib_dealloc_device(&dd->verbs_dev.ibdev); |
1181 | return ERR_PTR(ret);; | 1180 | return ERR_PTR(ret); |
1182 | } | 1181 | } |
1183 | 1182 | ||
1184 | /* | 1183 | /* |