---

yaml --- r: 282744 b: refs/heads/master c: 7920aa5 h: refs/heads/master v: v3
git-mirror · Jan 10, 2012 · bb19faa · bb19faa
1 parent 2e17098
commit bb19faa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7eef882a8d37be46459faa5020648af7ccf6ad2
+refs/heads/master: 7920aa5a9d841fc7a10ff53a5a775f821d7a6ba1
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -933,10 +933,8 @@ static int ttm_dma_pool_get_num_unused_pages(void)
 	unsigned total = 0;
 
 	mutex_lock(&_manager->lock);
-	list_for_each_entry(p, &_manager->pools, pools) {
-		if (p)
-			total += p->pool->npages_free;
-	}
+	list_for_each_entry(p, &_manager->pools, pools)
+		total += p->pool->npages_free;
 	mutex_unlock(&_manager->lock);
 	return total;
 }
@@ -1031,7 +1029,7 @@ static int ttm_dma_pool_mm_shrink(struct shrinker *shrink,
 	list_for_each_entry(p, &_manager->pools, pools) {
 		unsigned nr_free;
 
-		if (!p && !p->dev)
+		if (!p->dev)
 			continue;
 		if (shrink_pages == 0)
 			break;