Module Name:    src
Committed By:   mrg
Date:           Thu Dec 31 06:44:11 UTC 2020

Modified Files:
        src/sys/arch/arm/rockchip: rk_i2s.c

Log Message:
save the return value of fdtbus_clock_enable() so we can both
report it correctly instead of always 0, and also return failure
to the caller.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rk_i2s.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/rockchip/rk_i2s.c
diff -u src/sys/arch/arm/rockchip/rk_i2s.c:1.3 src/sys/arch/arm/rockchip/rk_i2s.c:1.4
--- src/sys/arch/arm/rockchip/rk_i2s.c:1.3	Sat Feb 29 05:51:10 2020
+++ src/sys/arch/arm/rockchip/rk_i2s.c	Thu Dec 31 06:44:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_i2s.c,v 1.3 2020/02/29 05:51:10 isaki Exp $ */
+/* $NetBSD: rk_i2s.c,v 1.4 2020/12/31 06:44:11 mrg Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_i2s.c,v 1.3 2020/02/29 05:51:10 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_i2s.c,v 1.4 2020/12/31 06:44:11 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -536,7 +536,8 @@ rk_i2s_clock_init(struct rk_i2s_softc *s
 	}
 
 	/* Enable bus clock */
-	if (fdtbus_clock_enable(phandle, "i2s_hclk", true) != 0) {
+	error = fdtbus_clock_enable(phandle, "i2s_hclk", true);
+	if (error != 0) {
 		aprint_error(": couldn't enable i2s_hclk clock: %d\n", error);
 		return error;
 	}

Reply via email to