aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>2016-03-11 12:17:26 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-03-13 19:39:54 +0100
commitc1f415c9acb5877c408d9311eb837d7d50636a68 (patch)
tree430f7dfc044b704548705993438399cb9763c777
parent7c01878254daadbb91f5b1137b7404d952e3931b (diff)
drm: atomic helper: do not unreference error pointertopic/drm-misc-2016-03-14
562c5b4d8986 didn't quite fix the issue of dealing with an error pointer. We can't free/unref an error pointer so reset it to NULL. Many thanks to Dan Carpenter for pointing this out again. Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: Daniel Stone <daniels@collabora.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Matt Roper <matthew.d.roper@intel.com> Cc: dri-devel@lists.freedesktop.org Fixes: 562c5b4d8986 ("drm: fix blob pointer check") Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1457698646-22231-1-git-send-email-lionel.g.landwerlin@intel.com
-rw-r--r--drivers/gpu/drm/drm_atomic_helper.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 67261ca03fbf..e93bb0bbdd82 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2926,6 +2926,7 @@ void drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
NULL);
if (IS_ERR(blob)) {
ret = PTR_ERR(blob);
+ blob = NULL;
goto fail;
}

Privacy Policy