These two patches fix the same issue:
- drm/v3d: Fix memory leak in v3d_submit_cl_ioctl (29cd13cfd76) - drm/v3d: don't leak bin job if v3d_job_init fails (0d352a3a8a1)
And it seems that the conflict was missed during the merge.
Get rid of one of the free() calls.
Fixes: 77e0723bd27f ("Merge v5.4-rc7 into drm-next") Signed-off-by: Nicolas Saenz Julienne nsaenzjulienne@suse.de --- drivers/gpu/drm/v3d/v3d_gem.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 915f8bfdb58c..3cfbdb8e6a91 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -570,7 +570,6 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, if (ret) { kfree(bin); v3d_job_put(&render->base); - kfree(bin); return ret; }