diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-07-24 16:44:47 +0300 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-07-24 16:44:47 +0300 |
| commit | 61b7369483efb5e0a9f3b48e75fac00d46d661e0 (patch) | |
| tree | 6a97cc6f8857f0d26dcd48627aa6f31b9875b07e /drivers/net/ethernet/amd/pds_core/core.c | |
| parent | c3f698d85ecaf66d42871865b38c976c128c297c (diff) | |
| parent | 6c7f27441d6af776a89147027c6f4a11c0162c64 (diff) | |
| download | linux-61b7369483efb5e0a9f3b48e75fac00d46d661e0.tar.xz | |
Merge drm/drm-next into drm-misc-next
Backmerging to get v6.5-rc2.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/net/ethernet/amd/pds_core/core.c')
| -rw-r--r-- | drivers/net/ethernet/amd/pds_core/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c index 483a070d96fa..f2c79456d745 100644 --- a/drivers/net/ethernet/amd/pds_core/core.c +++ b/drivers/net/ethernet/amd/pds_core/core.c @@ -196,7 +196,7 @@ int pdsc_qcq_alloc(struct pdsc *pdsc, unsigned int type, unsigned int index, dma_addr_t q_base_pa; int err; - qcq->q.info = vzalloc(num_descs * sizeof(*qcq->q.info)); + qcq->q.info = vcalloc(num_descs, sizeof(*qcq->q.info)); if (!qcq->q.info) { err = -ENOMEM; goto err_out; @@ -219,7 +219,7 @@ int pdsc_qcq_alloc(struct pdsc *pdsc, unsigned int type, unsigned int index, if (err) goto err_out_free_q_info; - qcq->cq.info = vzalloc(num_descs * sizeof(*qcq->cq.info)); + qcq->cq.info = vcalloc(num_descs, sizeof(*qcq->cq.info)); if (!qcq->cq.info) { err = -ENOMEM; goto err_out_free_irq; |