[src/netbsd-9]: src/sys/arch/i386/stand/efiboot Pull up following revision(s)...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7d7ba9dfdbcd
branches:  netbsd-9
changeset: 843774:7d7ba9dfdbcd
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jan 21 15:22:21 2020 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #631):

        sys/arch/i386/stand/efiboot/devopen.c: revision 1.10
        sys/arch/i386/stand/efiboot/devopen.c: revision 1.11

fix indent.

x86 efiboot: Fixed the problem that /EFI/NetBSD/boot.cfg could not be loaded.

diffstat:

 sys/arch/i386/stand/efiboot/devopen.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r f801ccc715b0 -r 7d7ba9dfdbcd sys/arch/i386/stand/efiboot/devopen.c
--- a/sys/arch/i386/stand/efiboot/devopen.c     Tue Jan 21 15:19:51 2020 +0000
+++ b/sys/arch/i386/stand/efiboot/devopen.c     Tue Jan 21 15:22:21 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: devopen.c,v 1.5.6.3 2019/12/17 12:59:52 martin Exp $    */
+/*     $NetBSD: devopen.c,v 1.5.6.4 2020/01/21 15:22:21 martin Exp $    */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -100,10 +100,10 @@
                *devname = "hd";
 
        (void)biosdisk_findpartition(biosdev, sector, partition, part_name);
-       if (*part_name != NULL) {
+       if (part_name != NULL && *part_name != NULL) {
                snprintf(savedevname, sizeof(savedevname),
                    "NAME=%s", *part_name);
-                       *devname = savedevname;
+               *devname = savedevname;
        }
 }