summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2014-04-01 15:15:47 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-30 21:52:14 -0700
commitdec8ba10d0770e4361259e52217ec81bea8d96a2 (patch)
treef02b763180dce758ac43e4824d44e37faf1a3dda /drivers
parenta741acc0124c0d20941a86edb475329eb47e0aee (diff)
downloadlinux-3.10-dec8ba10d0770e4361259e52217ec81bea8d96a2.tar.gz
linux-3.10-dec8ba10d0770e4361259e52217ec81bea8d96a2.tar.bz2
linux-3.10-dec8ba10d0770e4361259e52217ec81bea8d96a2.zip
drm/qxl: unset a pointer in sync_obj_unref
commit 41ccec352f3c823931a7d9d2a9c7880c14d7415a upstream. This fixes a BUG_ON(bo->sync_obj != NULL); in ttm_bo_release_list. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/qxl/qxl_ttm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 489cb8cece4..3401eb86786 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -431,6 +431,7 @@ static int qxl_sync_obj_flush(void *sync_obj)
static void qxl_sync_obj_unref(void **sync_obj)
{
+ *sync_obj = NULL;
}
static void *qxl_sync_obj_ref(void *sync_obj)