From nobody Fri Sep 22 16:51:39 2023 X-Original-To: dev-commits-src-all@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 4RsdZz3CKXz4v6xY; Fri, 22 Sep 2023 16:51:39 +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 4RsdZz2S92z4MTN; Fri, 22 Sep 2023 16:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695401499; 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=ypKoZTg7Wz8KXIMNp3hvuZ98OqqSw00b9f/zeVMB84Y=; b=sxEhdzmwYBfkzTFu+AxhHC9LvlbRmhFmbGJnWBtJ7g2P4MFvnhVsmhrTU6jZ1FXX2SoUqY ZAAIibhb8cw4Mv6q2GGGzWF3M76bGdh4UVr2zSE37stb6/LebxcGNkzqCNK9Y2GT8DO4q1 DLqKRgvPdpy56M3ZMBohPahP0k/DAB5l/oArDDyh8TYFrK0OIpt1y8p5S0ulAVEL5/LyYh wd+ERyh++OLkz6r+4YT0a1zNZld3q6Qp/G46s45fg3PAsBiwmGGPsEVhzPg5QCkBTpHV2I SVXiP0aw33YVjTZ362kYdXtMI/5dCjSunR4/MPz0CIE5VkQDlZvmc4KQcN5VeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695401499; a=rsa-sha256; cv=none; b=Ai8dKn/ckKg/8JAGKdBe3e47ciqLKdH0r3SkmjxTGqgHpXl5o/7ajx/qquLNONuKSKPqS9 3D+0Wnm58oucB/y6JmuxXtkBk00qPXK26oR98ZHNCU3sWLPXO2ZGH45z08Qo27QhL4y/xb s2UFvhaX/wjMoURkebUuNkDhIA7HRZdgrQOh6fU/MEHDs/E0rPitJ++6gU9Bfu9IkFpta4 XnFoZYfvGSwO8rCWgqzhMWraUoKB+XjKMml9s/eJrvcM4TjWNkLcYlTTyl67xdyttGDurn Ng+qcUYo6qeicDd0YCzLYhAHjJlQ3MsMZxYNk28HKmHteTHY0pG8uVX5VUlp2w== 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=1695401499; 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=ypKoZTg7Wz8KXIMNp3hvuZ98OqqSw00b9f/zeVMB84Y=; b=SHM8OTwtLSioaghnOK+1AyQaO+TOevqt+U4jCYJnJmCYg137lZpfUzV3v3LzJU1TnyO2Ix byQoY0NKUwiVwGZPudJ8zwz5L8Dd3vLShEPbFLr+V6dikHr/H9oLuYZtCfKtbgj7SF1Ev0 RW34GCt0a0nNZTG2lQxzIcwlHX7vxaXQ5cgfQSdK5ujdqDgZWkK3xxxHtIz6hDF99bgW6V 4aiQ2ZnL9z1ilgMhVpSd+3zGmA86FhVTDAW0Hzh1n7hHIgNVoDIgSYaRmI+oB/aj3CS+A1 0sIv9CUcqhyEP7SQGORQTSsYGI0waHb1DlaoSPCvNF/j0T3Z8/7OPao9/rYFrQ== 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 4RsdZz1XB1zTx9; Fri, 22 Sep 2023 16:51:39 +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 38MGpdAk043946; Fri, 22 Sep 2023 16:51:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MGpdEw043944; Fri, 22 Sep 2023 16:51:39 GMT (envelope-from git) Date: Fri, 22 Sep 2023 16:51:39 GMT Message-Id: <202309221651.38MGpdEw043944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 66946511380b - main - iicbus: pmic: rk8xx: Fix logic in clock-output-names detection List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 66946511380bf088c96a7517ba9b018c943655c6 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=66946511380bf088c96a7517ba9b018c943655c6 commit 66946511380bf088c96a7517ba9b018c943655c6 Author: Emmanuel Vadot AuthorDate: 2023-09-22 16:47:16 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-22 16:51:33 +0000 iicbus: pmic: rk8xx: Fix logic in clock-output-names detection Pointy hat to: manu (probably) --- 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);