diff options
| author | Petr Mladek <pmladek@suse.com> | 2020-08-04 16:27:43 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2020-08-04 16:27:43 +0200 |
| commit | 57e60db3bc4d2755aefe5abd1024662f478770ac (patch) | |
| tree | 8ef1fd13a622567bc3867fc37874780650a7a97e /arch | |
| parent | 30d497a0e1aadd904867081246c310dd0284eb41 (diff) | |
| parent | 6f2fdb298bf8e3207d060d57f2565b13d9300d2f (diff) | |
| download | linux-57e60db3bc4d2755aefe5abd1024662f478770ac.tar.gz linux-57e60db3bc4d2755aefe5abd1024662f478770ac.tar.bz2 linux-57e60db3bc4d2755aefe5abd1024662f478770ac.zip | |
Merge branch 'for-5.9-console-return-codes' into for-linus
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/fw/arc/arc_con.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/fw/arc/arc_con.c b/arch/mips/fw/arc/arc_con.c index 365e3913231e..7fdce236b298 100644 --- a/arch/mips/fw/arc/arc_con.c +++ b/arch/mips/fw/arc/arc_con.c @@ -28,7 +28,9 @@ static void prom_console_write(struct console *co, const char *s, static int prom_console_setup(struct console *co, char *options) { - return !(prom_flags & PROM_FLAG_USE_AS_CONSOLE); + if (prom_flags & PROM_FLAG_USE_AS_CONSOLE) + return 0; + return -ENODEV; } static struct console arc_cons = { |