[src/netbsd-9]: src/sys/arch/arm/rockchip Pull up following revision(s) (requ...

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

details:   https://anonhg.NetBSD.org/src/rev/ee72982272f9
branches:  netbsd-9
changeset: 963364:ee72982272f9
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 08 12:55:30 2019 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #498):

        sys/arch/arm/rockchip/rk3399_pcie.c: revision 1.7

Do not crash if the optional vpcie3v3-supply property is missing or the
regulator can not be found.

diffstat:

 sys/arch/arm/rockchip/rk3399_pcie.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 0bd155d62cfd -r ee72982272f9 sys/arch/arm/rockchip/rk3399_pcie.c
--- a/sys/arch/arm/rockchip/rk3399_pcie.c       Sun Dec 08 12:54:10 2019 +0000
+++ b/sys/arch/arm/rockchip/rk3399_pcie.c       Sun Dec 08 12:55:30 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_pcie.c,v 1.6 2019/06/23 16:15:43 jmcneill Exp $ */
+/* $NetBSD: rk3399_pcie.c,v 1.6.2.1 2019/12/08 12:55:30 martin Exp $ */
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis%openbsd.org@localhost>
  *
@@ -17,7 +17,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.6 2019/06/23 16:15:43 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.6.2.1 2019/12/08 12:55:30 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -241,8 +241,10 @@
 
        struct fdtbus_regulator *regulator;
        regulator = fdtbus_regulator_acquire(phandle, "vpcie3v3-supply");
-       fdtbus_regulator_enable(regulator);
-       fdtbus_regulator_release(regulator);
+       if (regulator != NULL) {
+               fdtbus_regulator_enable(regulator);
+               fdtbus_regulator_release(regulator);
+       }
                
        fdtbus_clock_assign(phandle);
        clock_enable_all(phandle);