|
@@ -3545,7 +3545,7 @@ int register_con_driver(const struct consw *csw, int first, int last)
|
|
|
|
|
|
/* already registered */
|
|
|
if (con_driver->con == csw)
|
|
|
- retval = -EINVAL;
|
|
|
+ retval = -EBUSY;
|
|
|
}
|
|
|
|
|
|
if (retval)
|
|
@@ -3656,7 +3656,12 @@ int take_over_console(const struct consw *csw, int first, int last, int deflt)
|
|
|
int err;
|
|
|
|
|
|
err = register_con_driver(csw, first, last);
|
|
|
-
|
|
|
+ /* if we get an busy error we still want to bind the console driver
|
|
|
+ * and return success, as we may have unbound the console driver
|
|
|
+ * but not unregistered it.
|
|
|
+ */
|
|
|
+ if (err == -EBUSY)
|
|
|
+ err = 0;
|
|
|
if (!err)
|
|
|
bind_con_driver(csw, first, last, deflt);
|
|
|
|