Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3002830 authored by Elliot Berman's avatar Elliot Berman
Browse files

hvc: haven: Move CONSOLE_OPEN before hvc_instantiate 



While calling hvc_instantiate, current log buffer is flushed through the
newly registered console driver. Presently, no call was made to
CONSOLE_OPEN, thus RM returns an error for all of these CONSOLE_WRITEs.
Move the CONSOLE_OPEN prior to calling hvc_instantiate.

Change-Id: Ia8d02f5cff819fee54ec66c4df140d0af216baa5
Signed-off-by: default avatarElliot Berman <eberman@codeaurora.org>
parent 114be259

drivers/tty/hvc/hvc_haven.c

+5 −10
Original line number Diff line number Diff line
@@ -226,24 +226,21 @@ static int __init hvc_hh_console_init(void) 
{

	int ret;



	/* Need to call RM CONSOLE_OPEN before console can be used */

	ret = hh_rm_console_open(0);

	if (ret)

		return ret;



	ret = hvc_instantiate(hh_vm_name_to_vtermno(HH_SELF_VM), 0,

			      &hh_hv_ops);



	return ret < 0 ? -ENODEV : 0;

}



static void __init hh_hvc_console_post_init(void)

{

	/* Need to call RM CONSOLE_OPEN before console can be used */

	hh_hvc_notify_add(hh_hvc_data[HH_SELF_VM].hvc, HH_SELF_VM);

}

#else

static int __init hvc_hh_console_init(void)

{

	return 0;

}



static void __init hh_hvc_console_post_init(void) { }

#endif /* CONFIG_HVC_HAVEN_CONSOLE */



static int __init hvc_hh_init(void)
@@ -276,8 +273,6 @@ static int __init hvc_hh_init(void) 
	if (ret)

		goto bail;



	hh_hvc_console_post_init();



	return 0;

bail:

	for (--i; i >= 0; i--) {