Merge branch 'next' into for-linus

Prepare first round of input updates for 3.18.

1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/drm_buffer.c
index 0406110f83ed..86a4a4a60afc 100644
--- a/drivers/gpu/drm/drm_buffer.c
+++ b/drivers/gpu/drm/drm_buffer.c
@@ -80,11 +80,7 @@ int drm_buffer_alloc(struct drm_buffer **buf, int size)
 
 error_out:
 
-        /* Only last element can be null pointer so check for it first. */
-        if ((*buf)->data[idx])
-                kfree((*buf)->data[idx]);
-
-        for (--idx; idx >= 0; --idx)
+        for (; idx >= 0; --idx)
                 kfree((*buf)->data[idx]);
 
         kfree(*buf);