diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2016-05-03 17:05:54 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-10 23:07:27 -0400 |
| commit | 5ec75b71be17201805f2e6b7ef9f17f2d6b412d3 (patch) | |
| tree | 92a9726b4cbd6b381eeda63c2f99ab6d51fd4a86 /drivers | |
| parent | 87e0b5757eab598f4b55babdc8879e143a556b7a (diff) | |
tty: vt, return error when con_startup fails
[ Upstream commit 6798df4c5fe0a7e6d2065cf79649a794e5ba7114 ]
When csw->con_startup() fails in do_register_con_driver, we return no
error (i.e. 0). This was changed back in 2006 by commit 3e795de763.
Before that we used to return -ENODEV.
So fix the return value to be -ENODEV in that case again.
Fixes: 3e795de763 ("VT binding: Add binding/unbinding support for the VT console")
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Reported-by: "Dan Carpenter" <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/vt/vt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 4a24eb2b0ede..ba86956ef4b5 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -3587,9 +3587,10 @@ static int do_register_con_driver(const struct consw *csw, int first, int last) goto err; desc = csw->con_startup(); - - if (!desc) + if (!desc) { + retval = -ENODEV; goto err; + } retval = -EINVAL; |