diff options
| author | Toomas Soome <tsoome@me.com> | 2019-03-07 08:52:12 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-03-08 21:58:54 +0200 |
| commit | dbef1f18aebff7758796283d40875419be721c2b (patch) | |
| tree | 642fb4681663114df867c8b1f1955d2fbbbd001b /usr/src | |
| parent | 7b38fab6300e0a1599b9741cfeafd94d362b87aa (diff) | |
| download | illumos-joyent-dbef1f18aebff7758796283d40875419be721c2b.tar.gz | |
10510 loader: bios comc_probe() is out of sync with uefi version
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/boot/sys/boot/i386/libi386/comconsole.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr/src/boot/sys/boot/i386/libi386/comconsole.c b/usr/src/boot/sys/boot/i386/libi386/comconsole.c index 29ed725b89..f4cd9b32fb 100644 --- a/usr/src/boot/sys/boot/i386/libi386/comconsole.c +++ b/usr/src/boot/sys/boot/i386/libi386/comconsole.c @@ -139,12 +139,14 @@ struct console ttyd = { static void comc_probe(struct console *cp) { - struct serial *port; - char name[20]; - char value[20]; - char *cons, *env; + struct serial *port; + char name[20]; + char value[20]; + char *cons, *env; + + if (cp->c_private != NULL) + return; - if (cp->c_private == NULL) { cp->c_private = malloc(sizeof(struct serial)); port = cp->c_private; port->speed = COMSPEED; @@ -224,8 +226,7 @@ comc_probe(struct console *cp) unsetenv(name); env_setenv(name, EV_VOLATILE, env, comc_pcidev_set, env_nounset); - } - comc_setup(cp); + comc_setup(cp); } static int |