mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
drm: rcar-du: Clean up planes in the error paths of .atomic_commit()
When the .atomic_commit() handler fails, clean up planes previoulsy prepared by drm_atomic_helper_prepare_planes() with a call to drm_atomic_helper_cleanup_planes(). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
parent
898a2f387d
commit
39a3d57065
1 changed files with 9 additions and 3 deletions
|
@ -495,8 +495,10 @@ static int rcar_du_atomic_commit(struct drm_device *dev,
|
|||
|
||||
/* Allocate the commit object. */
|
||||
commit = kzalloc(sizeof(*commit), GFP_KERNEL);
|
||||
if (commit == NULL)
|
||||
return -ENOMEM;
|
||||
if (commit == NULL) {
|
||||
ret = -ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
|
||||
INIT_WORK(&commit->work, rcar_du_atomic_work);
|
||||
commit->dev = dev;
|
||||
|
@ -519,7 +521,7 @@ static int rcar_du_atomic_commit(struct drm_device *dev,
|
|||
|
||||
if (ret) {
|
||||
kfree(commit);
|
||||
return ret;
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* Swap the state, this is the point of no return. */
|
||||
|
@ -531,6 +533,10 @@ static int rcar_du_atomic_commit(struct drm_device *dev,
|
|||
rcar_du_atomic_complete(commit);
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
drm_atomic_helper_cleanup_planes(dev, state);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue