Skip to contentSkip to conversation

Drivers: char: misc: 'misc_deregister()' changed the 'mutex_unlock' logic upon an error

PATCH New Elad Wexler 1 participant 1 message Sep 14, 2013 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Drivers: char: misc: 'misc_deregister()' changed the 'mutex_unlock' logic upon an error

From: Elad Wexler <[email protected]>

This change improves code readability & is less error-prone.
For example: case adding more error paths one should remember to call 'mutex_unlock'

---
 drivers/char/misc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/char/misc.c +4 -4
index 190d442..dd91726 100644
@@ -193,8 +193,8 @@ int misc_register(struct miscdevice * misc)
 	if (misc->minor == MISC_DYNAMIC_MINOR) {
 		int i = find_first_zero_bit(misc_minors, DYNAMIC_MINORS);
 		if (i >= DYNAMIC_MINORS) {
-			mutex_unlock(&misc_mtx);
-			return -EBUSY;
+			err =  -EBUSY;
+			goto out;
 		}
 		misc->minor = DYNAMIC_MINORS - i - 1;
 		set_bit(i, misc_minors);
@@ -203,8 +203,8 @@ int misc_register(struct miscdevice * misc)
 
 		list_for_each_entry(c, &misc_list, list) {
 			if (c->minor == misc->minor) {
-				mutex_unlock(&misc_mtx);
-				return -EBUSY;
+				err = -EBUSY;
+				goto out;
 			}
 		}
 	}
Signature · 1 line
1.8.3.1