drm: atomic helper: do not unreference error pointer
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Fri, 11 Mar 2016 12:17:26 +0000 (12:17 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 13 Mar 2016 18:39:54 +0000 (19:39 +0100)
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
drivers/gpu/drm/drm_atomic_helper.c

index 67261ca03fbf468d8c38edfa1af322a2f9b57124..e93bb0bbdd824737b610319407e95ac3ab69a224 100644 (file)
@@ -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;
        }