From d890eb235db4a3d8455a91f3be7b9eab65dae533 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 9 Jan 2012 15:44:50 +0300 Subject: [PATCH] --- yaml --- r: 282742 b: refs/heads/master c: 55ba70c40661b61f98c4188c428f265009af1aa5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_gart.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 164ad88b4c1f..fbe90d2d1f77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5215ef1a877cd81a2558f3ddbcf784671a27588 +refs/heads/master: 55ba70c40661b61f98c4188c428f265009af1aa5 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_gart.c b/trunk/drivers/gpu/drm/radeon/radeon_gart.c index 8597d2c016e6..a97baf5c114f 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_gart.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_gart.c @@ -494,10 +494,10 @@ int radeon_vm_bo_add(struct radeon_device *rdev, } if (bo_va->soffset >= tmp->soffset && bo_va->soffset < tmp->eoffset) { /* bo and tmp overlap, invalid offset */ - kfree(bo_va); dev_err(rdev->dev, "bo %p va 0x%08X conflict with (bo %p 0x%08X 0x%08X)\n", bo, (unsigned)bo_va->soffset, tmp->bo, (unsigned)tmp->soffset, (unsigned)tmp->eoffset); + kfree(bo_va); mutex_unlock(&vm->mutex); return -EINVAL; }