From d648b35f97857b3de6f671ebc7a61cdf3e0cfe6c Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Wed, 24 Apr 2013 19:04:57 +0300 Subject: [PATCH] --- yaml --- r: 371638 b: refs/heads/master c: 98b76231d7ef49c71c7fea354f00c619ab2c1be4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_prime.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5266a0b82eef..204423d23ad9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33896bf3207d8812274747b8b96776d27082e580 +refs/heads/master: 98b76231d7ef49c71c7fea354f00c619ab2c1be4 diff --git a/trunk/drivers/gpu/drm/drm_prime.c b/trunk/drivers/gpu/drm/drm_prime.c index 71c7315ca00f..dcde35231e25 100644 --- a/trunk/drivers/gpu/drm/drm_prime.c +++ b/trunk/drivers/gpu/drm/drm_prime.c @@ -488,11 +488,8 @@ EXPORT_SYMBOL(drm_prime_init_file_private); void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv) { - struct drm_prime_member *member, *safe; - list_for_each_entry_safe(member, safe, &prime_fpriv->head, entry) { - list_del(&member->entry); - kfree(member); - } + /* by now drm_gem_release should've made sure the list is empty */ + WARN_ON(!list_empty(&prime_fpriv->head)); } EXPORT_SYMBOL(drm_prime_destroy_file_private);