From 675538fa2df2ff75921c7a7fda9ac4a5031fa85c Mon Sep 17 00:00:00 2001 From: Jerome Glisse Date: Thu, 3 Nov 2011 01:22:39 -0400 Subject: [PATCH] --- yaml --- r: 282485 b: refs/heads/master c: 5e2656804a34f58c2bf557465ab77f8a26a500eb h: refs/heads/master i: 282483: cb9c902bf4305c51e641d82835305dacf9e12944 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_tt.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 14e5454bf26e..9b5535db0315 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a14af87b0b6f5c1d44c1adaa07f1bd347f81dc04 +refs/heads/master: 5e2656804a34f58c2bf557465ab77f8a26a500eb diff --git a/trunk/drivers/gpu/drm/ttm/ttm_tt.c b/trunk/drivers/gpu/drm/ttm/ttm_tt.c index f0c5ffd446d9..90527a2ce04c 100644 --- a/trunk/drivers/gpu/drm/ttm/ttm_tt.c +++ b/trunk/drivers/gpu/drm/ttm/ttm_tt.c @@ -90,7 +90,10 @@ static struct page *__ttm_tt_get_page(struct ttm_tt *ttm, int index) } return p; out_err: - put_page(p); + INIT_LIST_HEAD(&h); + list_add(&p->lru, &h); + ttm_put_pages(&h, 1, ttm->page_flags, + ttm->caching_state, &ttm->dma_address[index]); return NULL; }