From 0bfa4a82a99f8a8ab04f017d87941120da4369c3 Mon Sep 17 00:00:00 2001
From: "Dae S. Kim" <dae@velatum.com>
Date: Wed, 27 Feb 2013 17:05:14 -0800
Subject: [PATCH] --- yaml --- r: 359391 b: refs/heads/master c:
 3c94ce6f48f484bbc4dba83c0ed1f98f5e10957c h: refs/heads/master i:   359389:
 80a836b29d29598400790191788536ef0270b91e   359387:
 9ca3766abf350221e84d2448ea6339b57db0399a   359383:
 7e24e06b264cd103db316d17f1af0eb78bb1ea02   359375:
 edb997b664e5055e1941ceeac1e860651cf8398e   359359:
 5a164151fe7345708e6ebd8ecb4d919c16ed4e43 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/char/misc.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c177103de60d..8d80b38f1153 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2afae4629d74287aaac39d0532aac5819e77e70
+refs/heads/master: 3c94ce6f48f484bbc4dba83c0ed1f98f5e10957c
diff --git a/trunk/drivers/char/misc.c b/trunk/drivers/char/misc.c
index 522136d40843..190d4423653f 100644
--- a/trunk/drivers/char/misc.c
+++ b/trunk/drivers/char/misc.c
@@ -183,19 +183,12 @@ static const struct file_operations misc_fops = {
  
 int misc_register(struct miscdevice * misc)
 {
-	struct miscdevice *c;
 	dev_t dev;
 	int err = 0;
 
 	INIT_LIST_HEAD(&misc->list);
 
 	mutex_lock(&misc_mtx);
-	list_for_each_entry(c, &misc_list, list) {
-		if (c->minor == misc->minor) {
-			mutex_unlock(&misc_mtx);
-			return -EBUSY;
-		}
-	}
 
 	if (misc->minor == MISC_DYNAMIC_MINOR) {
 		int i = find_first_zero_bit(misc_minors, DYNAMIC_MINORS);
@@ -205,6 +198,15 @@ int misc_register(struct miscdevice * misc)
 		}
 		misc->minor = DYNAMIC_MINORS - i - 1;
 		set_bit(i, misc_minors);
+	} else {
+		struct miscdevice *c;
+
+		list_for_each_entry(c, &misc_list, list) {
+			if (c->minor == misc->minor) {
+				mutex_unlock(&misc_mtx);
+				return -EBUSY;
+			}
+		}
 	}
 
 	dev = MKDEV(MISC_MAJOR, misc->minor);