Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

+3 −5
Original line number Diff line number Diff line
@@ -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)

	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;