Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c94ce6f authored by Dae S. Kim's avatar Dae S. Kim Committed by Linus Torvalds
Browse files

drivers/char/misc.c:misc_register(): do not loop on misc_list unconditionally 



If the minor number is assigned dynamically, there is no need to search
for misc->minor in misc_list, since misc->minor == MISC_DYNAMIC_MINOR.

[akpm@linux-foundation.org: reduce scope of local `c']
Signed-off-by: default avatarDae S. Kim <dae@velatum.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2afae46

drivers/char/misc.c

+9 −7
Original line number Diff line number Diff line
@@ -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);