diff options
author | James Morris <jmorris@macbook.(none)> | 2009-12-03 09:33:40 +0300 |
---|---|---|
committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 09:33:40 +0300 |
commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /drivers/gpu/drm/ttm/ttm_global.c | |
parent | 7539cf4b92be4aecc573ea962135f246a7a33401 (diff) | |
parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
download | linux-c84d6efd363a3948eb32ec40d46bab6338580454.tar.xz |
Merge branch 'master' into next
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_global.c')
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_global.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_global.c b/drivers/gpu/drm/ttm/ttm_global.c index 541744d00d3e..b17007178a36 100644 --- a/drivers/gpu/drm/ttm/ttm_global.c +++ b/drivers/gpu/drm/ttm/ttm_global.c @@ -82,8 +82,8 @@ int ttm_global_item_ref(struct ttm_global_reference *ref) if (unlikely(ret != 0)) goto out_err; - ++item->refcount; } + ++item->refcount; ref->object = item->object; object = item->object; mutex_unlock(&item->mutex); |