From c54a33e92ee97127d56a1d0c55583474472d3e05 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Mon, 10 Dec 2012 21:57:20 +0100 Subject: [PATCH] --- yaml --- r: 348639 b: refs/heads/master c: 82c805abb20946dcb343cd607327e4d720bf6b28 h: refs/heads/master i: 348637: f87580890c07c9f36611f20c9f0219dd28f2b982 348635: 883dd1f44797992b6a8eb1e356d8f1635d4e5106 348631: 9097cb74995a3de9b14a0548c5e962ca72a824d0 348623: 9210a0c015fca7a752fc64ba9925d2ce61218a5b 348607: 85c51f5d5f3d03c015b411661091fa11a5cd220a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/core/handle.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 877f0e9ac3da..0f8e08473fdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfd376b6bfccf33782a0748a9c70f7f752f8b869 +refs/heads/master: 82c805abb20946dcb343cd607327e4d720bf6b28 diff --git a/trunk/drivers/gpu/drm/nouveau/core/core/handle.c b/trunk/drivers/gpu/drm/nouveau/core/core/handle.c index b8d2cbf8a7a7..264c2b338ac3 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/core/handle.c +++ b/trunk/drivers/gpu/drm/nouveau/core/core/handle.c @@ -109,7 +109,7 @@ nouveau_handle_create(struct nouveau_object *parent, u32 _parent, u32 _handle, while (!nv_iclass(namedb, NV_NAMEDB_CLASS)) namedb = namedb->parent; - handle = *phandle = kzalloc(sizeof(*handle), GFP_KERNEL); + handle = kzalloc(sizeof(*handle), GFP_KERNEL); if (!handle) return -ENOMEM; @@ -146,6 +146,9 @@ nouveau_handle_create(struct nouveau_object *parent, u32 _parent, u32 _handle, } hprintk(handle, TRACE, "created\n"); + + *phandle = handle; + return 0; }