From nobody Sun Nov 03 16:16:48 2024 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 4XhKVT1Dlrz5cNtS; Sun, 03 Nov 2024 16:16:49 +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 4XhKVS5rXYz4S0P; Sun, 3 Nov 2024 16:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730650608; 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=5TqASZ6dzm37ja/WjWNtdPC8zhJvbbDeI7X5OhSiERs=; b=N08F8ayoM/+RIxXyfmjyG6groKMeK6KSpmu5H320moW09I6aOixZvh80CvpnOhDU01B7zs 0MAEOQACA+dwsIzXDNFhwzULm9VdVfJ5Pe3tl4rhXi1Er9SvhaNFWEyhGhVjMUwV3at9da TDp2d6p942Ah4g32r5ZkrPpcbbv4ZNu84eVCadg4UpaXyIgKXQdLBNWAOlzgJ9kxmfsQrk 2pYlCifdnDudploo521U2OHZmObLU6bwGp0/+TiVxc0RUz3Lz6JU5OMj5lBF0gm8xRoSvI pTwXaHaEtAx2pTFQm11tj7tGrzFjTGILE/HaY2kOQ0a6eG3ZvnpNHyj9P54joQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730650608; 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=5TqASZ6dzm37ja/WjWNtdPC8zhJvbbDeI7X5OhSiERs=; b=GAEykdi4Tzhg5k2s1Q7lK8tyY+FWZv+olAR8O9PhIDEkML7vMN0Pw73KpSCQF7NZd9Oymn 2I98I3sA7+kRxr/rrFHg5p+Mih3brNBQiSnuhbCdfZ4SVHjrE35CuUSr+KFN4J/I5+H86U 44Vtnmn7lSFMsLhz6dvpWikAAPhBQhIgHGfoPTfhXLbRlV0qOoqCZWF3rcY1V0o5cfTmPu E7zNCdj+DXrsxvXnb4gje1ymKs09aFC2ongZv4EB98E6dfpyypLzwkMI+kJbwjcIrE9ZqJ XhNvycvwWpMqzdAdGBbMiGpGhGPYlY9jnKuIaJ7Qivoeek7daz6UsGyGMSaiVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730650608; a=rsa-sha256; cv=none; b=fwHFWhqWTNjwAOmVkkfu86ycbZtU/vbcGNbAvicYd6mO1GDHJAvy1TTR54E1hdh/i7TLgX jhWyijqkuHiyxEvGe82MCYfHN5uJPEN7I2y2yfzCbN9yZmp01IZS5tlQ4ypsGkpBloYu93 vi1vyh8lYkS2VKFfiEjTAWpjsZwI9rKD//8Tm8O0dL/jjr/UBsHE1VM0UFbP2eJRsMuQty LL1s+GWn4RIMeZhB9kXXgBtsnBMlyLuDYRopjwz5T2gFKyP4ZqInX6n69V1uBH7d/06vRS NgvaX9nD0CuexSem1lrv1Hk9vrrOy9b0fu1mfZU8uhaT/WD0H62Q1ybLnPhmNw== 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 4XhKVS511DzwFC; Sun, 3 Nov 2024 16:16:48 +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 4A3GGmpL036291; Sun, 3 Nov 2024 16:16:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3GGmKk036288; Sun, 3 Nov 2024 16:16:48 GMT (envelope-from git) Date: Sun, 3 Nov 2024 16:16:48 GMT Message-Id: <202411031616.4A3GGmKk036288@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: 574e7bad4a14 - releng/14.2 - acpi_gpiobus: OR GPIO_PIN_(IN|OUT)PUT into flags 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 574e7bad4a14bdc6316fa7a36cd1393c3137e11c Auto-Submitted: auto-generated The branch releng/14.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=574e7bad4a14bdc6316fa7a36cd1393c3137e11c commit 574e7bad4a14bdc6316fa7a36cd1393c3137e11c Author: Colin Percival AuthorDate: 2024-10-12 18:12:15 +0000 Commit: Colin Percival CommitDate: 2024-11-03 16:15:07 +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. Approved by: re (kib) MFC after: 2 weeks Sponsored by: Amazon (cherry picked from commit c808132731aa999947f4f7810157d7d8d9aaf61e) (cherry picked from commit 7c8f273bfba28d9d55ada94c80feb3ba97c53758) --- 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; }