tty: vt, finish looping on duplicate
When the console is already registered, stop crawling the registered_con_driver array and return an error immediatelly. This makes the code more obvious. And we do not need to initialize retval anymore. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6798df4c5f
commit
96317e9e2a
|
@ -3575,7 +3575,7 @@ static int do_register_con_driver(const struct consw *csw, int first, int last)
|
|||
struct module *owner = csw->owner;
|
||||
struct con_driver *con_driver;
|
||||
const char *desc;
|
||||
int i, retval = 0;
|
||||
int i, retval;
|
||||
|
||||
WARN_CONSOLE_UNLOCKED();
|
||||
|
||||
|
@ -3586,13 +3586,12 @@ static int do_register_con_driver(const struct consw *csw, int first, int last)
|
|||
con_driver = ®istered_con_driver[i];
|
||||
|
||||
/* already registered */
|
||||
if (con_driver->con == csw)
|
||||
if (con_driver->con == csw) {
|
||||
retval = -EBUSY;
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
||||
if (retval)
|
||||
goto err;
|
||||
|
||||
desc = csw->con_startup();
|
||||
if (!desc) {
|
||||
retval = -ENODEV;
|
||||
|
|
Loading…
Reference in a new issue