A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "hvc: haven: Move CONSOLE_OPEN before hvc_instantiate"

Browse source
This commit is contained in:
qctecmdr 2020-04-30 12:47:33 -07:00 • committed by Gerrit - the friendly Code Review server
commit 303f69ea7a
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/tty/hvc/hvc_haven.c
View file

@ -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--) {