Commit 7920aa5a authored by Dan Carpenter's avatar Dan Carpenter Committed by Dave Airlie

drm/ttm: fix condition (and vs or)

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Acked-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a7eef882
...@@ -933,10 +933,8 @@ static int ttm_dma_pool_get_num_unused_pages(void) ...@@ -933,10 +933,8 @@ static int ttm_dma_pool_get_num_unused_pages(void)
unsigned total = 0; unsigned total = 0;
mutex_lock(&_manager->lock); mutex_lock(&_manager->lock);
list_for_each_entry(p, &_manager->pools, pools) { list_for_each_entry(p, &_manager->pools, pools)
if (p) total += p->pool->npages_free;
total += p->pool->npages_free;
}
mutex_unlock(&_manager->lock); mutex_unlock(&_manager->lock);
return total; return total;
} }
...@@ -1031,7 +1029,7 @@ static int ttm_dma_pool_mm_shrink(struct shrinker *shrink, ...@@ -1031,7 +1029,7 @@ static int ttm_dma_pool_mm_shrink(struct shrinker *shrink,
list_for_each_entry(p, &_manager->pools, pools) { list_for_each_entry(p, &_manager->pools, pools) {
unsigned nr_free; unsigned nr_free;
if (!p && !p->dev) if (!p->dev)
continue; continue;
if (shrink_pages == 0) if (shrink_pages == 0)
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment