diff --git a/[refs] b/[refs]
index cb1374700d84..884ac5fe7bd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd5af0781aed12b9707d238c17cf55d46f9bf98d
+refs/heads/master: 0a0c721dc5d0de011e5d363cd454c60c66ca00ec
diff --git a/trunk/drivers/char/drm/drm_drv.c b/trunk/drivers/char/drm/drm_drv.c
index f9ecc8414b8a..654b95cdd9a3 100644
--- a/trunk/drivers/char/drm/drm_drv.c
+++ b/trunk/drivers/char/drm/drm_drv.c
@@ -155,10 +155,12 @@ int drm_lastclose(drm_device_t * dev)
 	del_timer(&dev->timer);
 
 	/* Clear pid list */
-	list_for_each_entry_safe(pt, next, &dev->magicfree, head) {
-		list_del(&pt->head);
-		drm_ht_remove_item(&dev->magiclist, &pt->hash_item);
-		drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
+	if (dev->magicfree.next) {
+		list_for_each_entry_safe(pt, next, &dev->magicfree, head) {
+			list_del(&pt->head);
+			drm_ht_remove_item(&dev->magiclist, &pt->hash_item);
+			drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
+		}
 	}
 
 	/* Clear AGP information */