[patch] drm/ttm: fix condition (and vs or)
Dan Carpenter
dan.carpenter at oracle.com
Wed Dec 7 22:50:54 PST 2011
The "if (!p && !p->dev)" condition isn't right because || was intended
instead of &&. But actually, "p" is the list cursor and so it's always
non-NULL and we can just remove that bit. We can remove the another
similar check as well.
Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index 6678abc..1cf4c2c 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -930,10 +930,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;
}
@@ -1023,7 +1021,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;
More information about the dri-devel
mailing list