Skip to content

Commit 02b8f0b

Browse files
committed
Merge tag 'exynos-drm-fixes-for-v6.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
Two fixups - Fix wrong return in Exynos vidi driver. - Fix use-after-free issue to Exynos g2d driver. Signed-off-by: Dave Airlie <[email protected]> From: Inki Dae <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents d6d4f0a + 48bfd02 commit 02b8f0b

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

drivers/gpu/drm/exynos/exynos_drm_g2d.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1335,7 +1335,7 @@ int exynos_g2d_exec_ioctl(struct drm_device *drm_dev, void *data,
13351335
/* Let the runqueue know that there is work to do. */
13361336
queue_work(g2d->g2d_workq, &g2d->runqueue_work);
13371337

1338-
if (runqueue_node->async)
1338+
if (req->async)
13391339
goto out;
13401340

13411341
wait_for_completion(&runqueue_node->complete);

drivers/gpu/drm/exynos/exynos_drm_vidi.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,6 @@ static int vidi_remove(struct platform_device *pdev)
469469
if (ctx->raw_edid != (struct edid *)fake_edid_info) {
470470
kfree(ctx->raw_edid);
471471
ctx->raw_edid = NULL;
472-
473-
return -EINVAL;
474472
}
475473

476474
component_del(&pdev->dev, &vidi_component_ops);

0 commit comments

Comments
 (0)