git: 7c8f273bfba2 - stable/14 - acpi_gpiobus: OR GPIO_PIN_(IN|OUT)PUT into flags
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 03 Nov 2024 16:02:21 UTC
The branch stable/14 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=7c8f273bfba28d9d55ada94c80feb3ba97c53758
commit 7c8f273bfba28d9d55ada94c80feb3ba97c53758
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: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;
}