Skip to content

Commit 16e1497

Browse files
committed
Merge tag 'gpio-fixes-for-v6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski: - fix the devres release callback for devm_gpiod_put_array() - add an ACPI quirk for Acer Nitro V15 suspend & wakeup * tag 'gpio-fixes-for-v6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpiolib: devres: release GPIOs in devm_gpiod_put_array() gpiolib: acpi: Add a quirk for Acer Nitro V15
2 parents d786aba + 11ff5e0 commit 16e1497

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

drivers/gpio/gpiolib-acpi-quirks.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,19 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] __initconst = {
331331
.ignore_interrupt = "AMDI0030:00@11",
332332
},
333333
},
334+
{
335+
/*
336+
* Wakeup only works when keyboard backlight is turned off
337+
* https://gitlab.freedesktop.org/drm/amd/-/issues/4169
338+
*/
339+
.matches = {
340+
DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
341+
DMI_MATCH(DMI_PRODUCT_FAMILY, "Acer Nitro V 15"),
342+
},
343+
.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
344+
.ignore_interrupt = "AMDI0030:00@8",
345+
},
346+
},
334347
{} /* Terminating entry */
335348
};
336349

drivers/gpio/gpiolib-devres.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ EXPORT_SYMBOL_GPL(devm_gpiod_unhinge);
319319
*/
320320
void devm_gpiod_put_array(struct device *dev, struct gpio_descs *descs)
321321
{
322-
devm_remove_action(dev, devm_gpiod_release_array, descs);
322+
devm_release_action(dev, devm_gpiod_release_array, descs);
323323
}
324324
EXPORT_SYMBOL_GPL(devm_gpiod_put_array);
325325

0 commit comments

Comments
 (0)