diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2016-05-03 18:05:54 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-12 15:48:18 +0300 |
| commit | f02212dd4bd88826afccc36146177589eccb699b (patch) | |
| tree | aff85d80944c5cc5bb84986b995b7c43719dcedc /drivers/tty | |
| parent | e35f6a53f66a0c6cdd2137fb9906771436fc9f65 (diff) | |
| download | linux-f02212dd4bd88826afccc36146177589eccb699b.tar.xz | |
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/tty')
| -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 53c25bca7d05..9062636d3154 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -3591,9 +3591,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; |