git: d7d51aad8fc6 - stable/14 - iicbus: pmic: rk8xx: Fix logic in clock-output-names detection
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 18 Oct 2023 14:34:30 UTC
The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d7d51aad8fc6b8428c8de442faab4a49e5f4c5b9 commit d7d51aad8fc6b8428c8de442faab4a49e5f4c5b9 Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2023-09-22 16:47:16 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2023-10-18 14:33:38 +0000 iicbus: pmic: rk8xx: Fix logic in clock-output-names detection Pointy hat to: manu (probably) (cherry picked from commit 66946511380bf088c96a7517ba9b018c943655c6) --- sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c b/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c index a51937da0060..a2ea1e5bb4ba 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c +++ b/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c @@ -112,7 +112,7 @@ rk8xx_attach_clocks(struct rk8xx_softc *sc) memset(&clkidef, 0, sizeof(clkidef)); clkidef.id = 0; - clkidef.name = (nclks = 2) ? clknames[0] : "clk32kout1"; + clkidef.name = (nclks == 2) ? clknames[0] : "clk32kout1"; clk = clknode_create(clkdom, &rk8xx_clk_clknode_class_0, &clkidef); if (clk == NULL) { device_printf(sc->dev, "Cannot create '%s'.\n", clkidef.name); @@ -124,7 +124,7 @@ rk8xx_attach_clocks(struct rk8xx_softc *sc) memset(&clkidef, 0, sizeof(clkidef)); clkidef.id = 1; - clkidef.name = (nclks = 2) ? clknames[1] : "clk32kout2"; + clkidef.name = (nclks == 2) ? clknames[1] : "clk32kout2"; clk = clknode_create(clkdom, &rk8xx_clk_clknode_class_1, &clkidef); if (clk == NULL) { device_printf(sc->dev, "Cannot create '%s'.\n", clkidef.name);