From nobody Sun Nov 03 16:02:21 2024 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 4XhK9n2xlDz5cMw6; Sun, 03 Nov 2024 16:02:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhK9n1Wphz4MnM; Sun, 3 Nov 2024 16:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730649741; 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=HwMe8vS9/f+XSDcfB5zGYhTKO17QNjLdM32PenGT7Cg=; b=ILRjr4uXXfb1cEZYzGDs/pdLge4Y/D0mE4tqnIZj8CFsrI7Vv0A6Mcj8cYDit/ZGStxBVa qmdyM3/SRYbGb8nrty2MOsVKI2liLjMK4W+1hvqnqz4o9m8bXFsQiDRptrObuBPviFxbK6 nd/+TpnGw/83uaOVjmEFqIfPlq8EBHgVIPsyQeXx9JPWSuuilboFz0QeZ63cHt8lZwTumf 8kPOr0H6ZjS6UY7rm4E5VUULtyXNxaYCfmuJPN+qVc70T+XyG0KJ2Q/Avhf2ghzRUOZBSy /aU4RX5DkVG7/FZgAVoBfZWBQg+cZUdKurrfdnIj91TCRcIiVO3Kxr16RofNCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730649741; 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=HwMe8vS9/f+XSDcfB5zGYhTKO17QNjLdM32PenGT7Cg=; b=GyDILxmbQPvn2rctT/ygK2eK3eRRkrNaVdtIndBd+Nhs82v+Jk1G9Wdfp5rbMGHnF9CuKo x99hG+cyWLezceYvpw3DTYGR/i5BZbJrKX1NxTsRn2x0yMLKWWw/cs7o2HStCdcMjZ8ZNF DpCgr6b9v5Knv+nN7VdRncW2SMOf4Z/QRuxfolWszu2MRwHrs0Fs9KAgvu78gggDfYw2tg W74BFCVN7fkX9WB9hT8gJUOpS4K9Z0Le/Ar9d/vfPgAZXm4Y4aQ1Ot88OsvjExwcCNQiuy /+V9fgsOfb09g5nUp7e1+Wf82y+fnzbIrNBlBz0tzaUjUXCDN3r733lxZj+zGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730649741; a=rsa-sha256; cv=none; b=wQEQG3JqpmD2oOKyppch2EiLW0HyQfeONcLynfeP/QKzw30jRPZGLwZrLoIgYWPoB+wx7V EI6LPQWQfG2hGx7Jy4kJE1xkcCcMoBDcfMqYq6h/hoA21uXiT6O6FM5h6iAZCvQ8I9LHun fXUjZrVH1D5I2aW+YXY9uNBzgktjxCl6URrNFE+pWuhfdcPJNHQ64gi9vL2ert50UYLSZ8 VdRRFQ0C2bSk/N6RIta3e9vAVqrhav31yQ71xLt1F/teqqDeDUB3MMmjZIeJ0BpS4+vLd1 VkzSvFQtKTQpmVe+hITb+zzCLUgNi9vn00yW1xT0/vWVNFPGyIqyMqKwrWcwkw== 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 4XhK9n17JPzwGL; Sun, 3 Nov 2024 16:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A3G2LLc015490; Sun, 3 Nov 2024 16:02:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3G2L8E015487; Sun, 3 Nov 2024 16:02:21 GMT (envelope-from git) Date: Sun, 3 Nov 2024 16:02:21 GMT Message-Id: <202411031602.4A3G2L8E015487@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 7c8f273bfba2 - stable/14 - acpi_gpiobus: OR GPIO_PIN_(IN|OUT)PUT into flags 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c8f273bfba28d9d55ada94c80feb3ba97c53758 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7c8f273bfba28d9d55ada94c80feb3ba97c53758 commit 7c8f273bfba28d9d55ada94c80feb3ba97c53758 Author: Colin Percival AuthorDate: 2024-10-12 18:12:15 +0000 Commit: Colin Percival CommitDate: 2024-11-03 16:01:27 +0000 acpi_gpiobus: OR GPIO_PIN_(IN|OUT)PUT into flags Right now flags is set to 0 before this "=" -> "|=" change, but it will matter when the NOT_YET section above becomes effective. MFC after: 2 weeks Sponsored by: Amazon (cherry picked from commit c808132731aa999947f4f7810157d7d8d9aaf61e) --- sys/dev/gpio/acpi_gpiobus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index eafa1c07fab1..3b6fc6dde674 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -75,10 +75,10 @@ acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *gpio_res) #endif switch (gpio_res->IoRestriction) { case ACPI_IO_RESTRICT_INPUT: - flags = GPIO_PIN_INPUT; + flags |= GPIO_PIN_INPUT; break; case ACPI_IO_RESTRICT_OUTPUT: - flags = GPIO_PIN_OUTPUT; + flags |= GPIO_PIN_OUTPUT; break; }