Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[cascardo/linux.git] / drivers / gpu / drm / drm_drv.c

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 8a9d079..9238de4 100644 (file)
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -182,7 +182,6 @@ static struct drm_ioctl_desc drm_ioctls[] = {
 int drm_lastclose(struct drm_device * dev)
 {
        struct drm_vma_entry *vma, *vma_temp;
-       int i;
 
        DRM_DEBUG("\n");
 
@@ -228,16 +227,6 @@ int drm_lastclose(struct drm_device * dev)
                kfree(vma);
        }
 
-       if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE) && dev->queuelist) {
-               for (i = 0; i < dev->queue_count; i++) {
-                       kfree(dev->queuelist[i]);
-                       dev->queuelist[i] = NULL;
-               }
-               kfree(dev->queuelist);
-               dev->queuelist = NULL;
-       }
-       dev->queue_count = 0;
-
        if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) &&
            !drm_core_check_feature(dev, DRIVER_MODESET))
                drm_dma_takedown(dev);
@@ -486,7 +475,7 @@ long drm_ioctl(struct file *filp,
                kfree(kdata);
        atomic_dec(&dev->ioctl_count);
        if (retcode)
-               DRM_DEBUG("ret = %x\n", retcode);
+               DRM_DEBUG("ret = %d\n", retcode);
        return retcode;
 }