Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Nov 2024 16:16:48 GMT
From:      Colin Percival <cperciva@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 574e7bad4a14 - releng/14.2 - acpi_gpiobus: OR GPIO_PIN_(IN|OUT)PUT into flags
Message-ID:  <202411031616.4A3GGmKk036288@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch releng/14.2 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=574e7bad4a14bdc6316fa7a36cd1393c3137e11c

commit 574e7bad4a14bdc6316fa7a36cd1393c3137e11c
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-10-12 18:12:15 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
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;
 	}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411031616.4A3GGmKk036288>