From nobody Wed Oct 18 14:34:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJl11Y2z4x6VN; Wed, 18 Oct 2023 14:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YJl0Jwdz3V27; Wed, 18 Oct 2023 14:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KOXp8FZpuM+p81ib5VDult5dlAE2GDASJ8nGCKnGBps=; b=KqdymkWimwB8e5rj2yDmq+IMUZS089ag1OfQiNQab2QYzvyZFvfleMzHu7ssdOjfElyADU I1qOLyWxhcvW8PWVu0/rO03sYs4z5ym2MARTjXpPE4WpBe7Br4LgionInaU+9pLm2BtNSd N9v94s3X6/CUWGvx9VbsALH6BQE6GQ9zVlIBO1Y8JGblzlnHymsU1AVzmcKcoufLl5CTYy dTDuN4fE0NFoJ0obFSL18PAFvzlDvdLsISEm1XB6xjIuaAd9TTNaoF0v20BR3c8bdaZILN P7Qh1KIsft+tgJNSVTeGBUXnGfvNeBiKalkWit7kiKd1Iq1q750QqfyefD4M+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639671; a=rsa-sha256; cv=none; b=nwD8qy9Txu5Aj7TBFZqfsmey13yfcEXIyd5foAYnVJAEnglYtk3ER4ZiWKyfz76FOvn60m IrbgxBFygc0mXStaFJtvRlp73Gm8s3GhWDOhF35gcraT1wEcx2rp8xlAfonen5suGpyMBl xr5Ol7/vsMN0EMx/7ScmobS5DrwJlJp67nXoWV7h1H7X0UqemZLXvRhDifA7be1i6W59Nc nbNBNfxS14bzq4kDQgjf3t9/dbOgceFVgw9sehKymQOOGfqhqtSSKjoBre8FD2WzvGi1x/ E9FMZ6tUHWUt/wU8mSs55qHPechwlxHEOqlsOfcxIwzMmrDg2CqY0VVQnqR8EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KOXp8FZpuM+p81ib5VDult5dlAE2GDASJ8nGCKnGBps=; b=App12hwyYJxHQQeRmD4PcOF3xcwb+tO4fQzs2Rj63TSllRK06fAGNtMLZb+oz1hpWBPc3B xL+AEhEDv018k8GzoXsIdGnMPFaadS+IH9I97trmktnuZHGuCWSQh1jGp+TJv/09fcjImn P928KPJ7qY9ZSMSYGYtfcD5Y5x9w56zWBb/X/AdzcM0yxqhqUUE4rKb2EsKDVPTcH+tVuV VgfDeBH2RtXqAWUReymqMGqa76UCKmJkLXrSqX5wIaL9NRtTXvUOw+JDQv8tAeIAFvEy6z gH8pBMwIB3G46oVBRQywR9YC25VtXxJ3iLd5voHg5TaGY2c1UabI7erQbUdHyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJk64chz18pG; Wed, 18 Oct 2023 14:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEYUIa092805; Wed, 18 Oct 2023 14:34:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYUAh092802; Wed, 18 Oct 2023 14:34:30 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:30 GMT Message-Id: <202310181434.39IEYUAh092802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: d7d51aad8fc6 - stable/14 - iicbus: pmic: rk8xx: Fix logic in clock-output-names detection List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d7d51aad8fc6b8428c8de442faab4a49e5f4c5b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d7d51aad8fc6b8428c8de442faab4a49e5f4c5b9 commit d7d51aad8fc6b8428c8de442faab4a49e5f4c5b9 Author: Emmanuel Vadot AuthorDate: 2023-09-22 16:47:16 +0000 Commit: Emmanuel Vadot 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);