hvc/xen: fix error path in xen_hvc_init() to always register frontend…

… driver The xen_hvc_init() function should always register the frontend driver, even when there's no primary console — as there may be secondary consoles. (Qemu can always add secondary consoles, but only the toolstack can add the primary because it's special.) Signed-off-by: David Woodhouse <[email protected]> Reviewed-by: Juergen Gross <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
torvalds · Oct 21, 2023 · 2704c9a · 2704c9a
1 parent ef5dd8e
commit 2704c9a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
@@ -588,7 +588,7 @@ static int __init xen_hvc_init(void)
  ops = &dom0_hvc_ops;
  r = xen_initial_domain_console_init();
  if (r < 0)
- return r;
+ goto register_fe;
  info = vtermno_to_xencons(HVC_COOKIE);
  } else {
  ops = &domU_hvc_ops;
@@ -597,7 +597,7 @@ static int __init xen_hvc_init(void)
  else
  r = xen_pv_console_init();
  if (r < 0)
- return r;
+ goto register_fe;
 
  info = vtermno_to_xencons(HVC_COOKIE);
  info->irq = bind_evtchn_to_irq_lateeoi(info->evtchn);
@@ -622,6 +622,7 @@ static int __init xen_hvc_init(void)
  }
 
  r = 0;
+ register_fe:
 #ifdef CONFIG_HVC_XEN_FRONTEND
  r = xenbus_register_frontend(&xencons_driver);
 #endif