diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-12-08 09:50:54 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-01-10 10:00:42 +0000 |
| commit | 7920aa5a9d841fc7a10ff53a5a775f821d7a6ba1 (patch) | |
| tree | 4604bbb97b3f0a69b5921aa71b804d0c71e9aa98 | |
| parent | a7eef882a8d37be46459faa5020648af7ccf6ad2 (diff) | |
| download | talos-obmc-linux-7920aa5a9d841fc7a10ff53a5a775f821d7a6ba1.tar.gz talos-obmc-linux-7920aa5a9d841fc7a10ff53a5a775f821d7a6ba1.zip | |
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: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 156ddcd304c3..37ead6995c87 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/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; |
