Merge tag 'drm-intel-next-2013-08-23' of git://people.freedesktop.org/~danvet/drm...

[karo-tx-linux.git] / drivers / gpu / drm / drm_mm.c

diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index aded1e11e8ff8a2ee86accb4ee949d471e4c226e..af93cc55259fd69e240625b152590d09dbca052d 100644 (file)
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -254,6 +254,9 @@ void drm_mm_remove_node(struct drm_mm_node *node)
        struct drm_mm *mm = node->mm;
        struct drm_mm_node *prev_node;
 
+       if (WARN_ON(!node->allocated))
+               return;
+
        BUG_ON(node->scanned_block || node->scanned_prev_free
                                   || node->scanned_next_free);