---

yaml
---
r: 189351
b: refs/heads/master
c: da58405
h: refs/heads/master
i:
  189349: 7919e12
  189347: 8fe808d
  189343: 176b802
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcbc451ba1948fba967198bd150ecbd10bbb7075
+refs/heads/master: da58405860b992d2bb21ebae5d685fe3204dd3f0

trunk/drivers/gpu/drm/drm_fops.c

@@ -140,14 +140,16 @@ int drm_open(struct inode *inode, struct file *filp)
 		spin_unlock(&dev->count_lock);
 	}
 out:
-	mutex_lock(&dev->struct_mutex);
-	if (minor->type == DRM_MINOR_LEGACY) {
-		BUG_ON((dev->dev_mapping != NULL) &&
-			(dev->dev_mapping != inode->i_mapping));
-		if (dev->dev_mapping == NULL)
-			dev->dev_mapping = inode->i_mapping;
+	if (!retcode) {
+		mutex_lock(&dev->struct_mutex);
+		if (minor->type == DRM_MINOR_LEGACY) {
+			if (dev->dev_mapping == NULL)
+				dev->dev_mapping = inode->i_mapping;
+			else if (dev->dev_mapping != inode->i_mapping)
+				retcode = -ENODEV;
+		}
+		mutex_unlock(&dev->struct_mutex);
 	}
-	mutex_unlock(&dev->struct_mutex);
 
 	return retcode;
 }