Commit 57e60db3 authored by Petr Mladek's avatar Petr Mladek
Browse files

Merge branch 'for-5.9-console-return-codes' into for-linus

parents 30d497a0 6f2fdb29

arch/mips/fw/arc/arc_con.c

+3 −1
Original line number Diff line number Diff line
@@ -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 = {

drivers/tty/hvc/hvc_xen.c

+2 −2
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static void xen_hvm_early_write(uint32_t vtermno, const char *str, int len) { } 
#endif



#ifdef CONFIG_EARLY_PRINTK

static int __init xenboot_setup_console(struct console *console, char *string)

static int __init xenboot_console_setup(struct console *console, char *string)

{

	static struct xencons_info xenboot;
@@ -647,7 +647,7 @@ static void xenboot_write_console(struct console *console, const char *string, 
struct console xenboot_console = {

	.name		= "xenboot",

	.write		= xenboot_write_console,

	.setup		= xenboot_setup_console,

	.setup		= xenboot_console_setup,

	.flags		= CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,

	.index		= -1,

};

drivers/tty/hvc/hvsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ static int __init hvsi_console_setup(struct console *console, char *options) 
	int ret;



	if (console->index < 0 || console->index >= hvsi_count)

		return -1;

		return -EINVAL;

	hp = &hvsi_ports[console->index];



	/* give the FSP a chance to change the baud rate when we re-open */

drivers/tty/serial/sunsab.c

+1 −1
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ static int sunsab_console_setup(struct console *con, char *options) 
	 * though...

	 */

	if (up->port.type != PORT_SUNSAB)

		return -1;

		return -EINVAL;



	printk("Console: ttyS%d (SAB82532)\n",

	       (sunsab_reg.minor - 64) + con->index);

drivers/tty/serial/sunzilog.c

+1 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options) 
	int baud, brg;



	if (up->port.type != PORT_SUNZILOG)

		return -1;

		return -EINVAL;



	printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n",

	       (sunzilog_reg.minor - 64) + con->index, con->index);