From ce8386b56185223f935328a6ebf87d336981aeb0 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 15 Apr 2010 14:42:34 +1000 Subject: [PATCH] --- yaml --- r: 196567 b: refs/heads/master c: 90af89b93c664f42096ef89edc8f7c7fc776d426 h: refs/heads/master i: 196565: 8e24f10f99cffcdf1581ef24629ca58d9887537f 196563: e76beba9cab82fa38a11277af7d03fa63af325cd 196559: 45833bbf2b6118e907f27f8ac426c99a326ffb8d v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 23f2e58601c2..c352db8cb73d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de1f46a4b97ad93870a06065cc2ef72e2c89fe35 +refs/heads/master: 90af89b93c664f42096ef89edc8f7c7fc776d426 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c index fb164efada3b..6f3c19522377 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -160,11 +160,11 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan, ret = ttm_bo_init(&dev_priv->ttm.bdev, &nvbo->bo, size, ttm_bo_type_device, &nvbo->placement, align, 0, false, NULL, size, nouveau_bo_del_ttm); - nvbo->channel = NULL; if (ret) { /* ttm will call nouveau_bo_del_ttm if it fails.. */ return ret; } + nvbo->channel = NULL; spin_lock(&dev_priv->ttm.bo_list_lock); list_add_tail(&nvbo->head, &dev_priv->ttm.bo_list);