1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index 3c0b882a8e72..b366c5b1bd16 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -118,7 +118,7 @@ static drm_ioctl_desc_t drm_ioctls[] = {
         [DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK)] = {drm_wait_vblank, 0},
 };
 
-#define DRIVER_IOCTL_COUNT      DRM_ARRAY_SIZE( drm_ioctls )
+#define DRIVER_IOCTL_COUNT      ARRAY_SIZE( drm_ioctls )
 
 /**
  * Take down the DRM device.
@@ -155,12 +155,13 @@ int drm_lastclose(drm_device_t * dev)
         del_timer(&dev->timer);
 
         /* Clear pid list */
-        for (i = 0; i < DRM_HASH_SIZE; i++) {
-                for (pt = dev->magiclist[i].head; pt; pt = next) {
-                        next = pt->next;
+        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);
                 }
-                dev->magiclist[i].head = dev->magiclist[i].tail = NULL;
+                drm_ht_remove(&dev->magiclist);
         }
 
         /* Clear AGP information */
@@ -299,6 +300,7 @@ static void drm_cleanup(drm_device_t * dev)
         if (dev->maplist) {
                 drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS);
                 dev->maplist = NULL;
+                drm_ht_remove(&dev->map_hash);
         }
 
         drm_ctxbitmap_cleanup(dev);