2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c
index 8df849f66830..b756f043a5f4 100644
--- a/drivers/gpu/drm/drm_proc.c
+++ b/drivers/gpu/drm/drm_proc.c
@@ -678,9 +678,9 @@ static int drm__vma_info(char *buf, char **start, off_t offset, int request,
         *start = &buf[offset];
         *eof = 0;
 
-        DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%08lx\n",
+        DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%llx\n",
                        atomic_read(&dev->vma_count),
-                       high_memory, virt_to_phys(high_memory));
+                       high_memory, (u64)virt_to_phys(high_memory));
         list_for_each_entry(pt, &dev->vmalist, head) {
                 if (!(vma = pt->vma))
                         continue;
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 096e2a37446d..7c8b15b22bf2 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -168,7 +168,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data,
             file_priv->minor->master != file_priv->master) {
                 mutex_lock(&dev->struct_mutex);
                 file_priv->minor->master = drm_master_get(file_priv->master);
-                mutex_lock(&dev->struct_mutex);
+                mutex_unlock(&dev->struct_mutex);
         }
 
         return 0;