| Message ID | 162060710518.130816.11349798049329202863.stgit@djiang5-desk3.ch.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 33f9f3c33e9336e5f49501c9632584c3d1f4f3a5 |
| Headers | show |
| Series | dmaengine: idxd: remove devm allocation for idxd->int_handles | expand |
On 09-05-21, 17:38, Dave Jiang wrote: > Allocation of idxd->int_handles was merged incorrectly for the 5.13 merge > window. The devm_kcalloc should've been regular kcalloc due to devm_* > removal series for the driver. Applied, thanks
diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c index 2a926bef87f2..21d3dcb1c0e3 100644 --- a/drivers/dma/idxd/init.c +++ b/drivers/dma/idxd/init.c @@ -311,7 +311,8 @@ static int idxd_setup_internals(struct idxd_device *idxd) init_waitqueue_head(&idxd->cmd_waitq); if (idxd->hw.cmd_cap & BIT(IDXD_CMD_REQUEST_INT_HANDLE)) { - idxd->int_handles = devm_kcalloc(dev, idxd->max_wqs, sizeof(int), GFP_KERNEL); + idxd->int_handles = kcalloc_node(idxd->max_wqs, sizeof(int), GFP_KERNEL, + dev_to_node(dev)); if (!idxd->int_handles) return -ENOMEM; }
Allocation of idxd->int_handles was merged incorrectly for the 5.13 merge window. The devm_kcalloc should've been regular kcalloc due to devm_* removal series for the driver. Fixes: eb15e7154fbf ("dmaengine: idxd: add interrupt handle request and release support") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- drivers/dma/idxd/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)