diff options
| author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2024-03-12 13:51:10 +0300 |
|---|---|---|
| committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2024-03-12 13:51:10 +0300 |
| commit | 1c0a50de025d0d52825dfa5d7749c56ad6c4fa00 (patch) | |
| tree | 4afe7988034d8272e19d72c5c563faa44b12e7dc /drivers/platform/x86/intel | |
| parent | 30f96b2cb70d882515efae4d4af698f18a65c75e (diff) | |
| parent | 0314cebb29be2f961abb37bd0b01cb16899868f2 (diff) | |
| download | linux-1c0a50de025d0d52825dfa5d7749c56ad6c4fa00.tar.xz | |
Merge tag 'platform-drivers-x86-v6.8-4' into pdx86/for-next
Merge tag 'platform-drivers-x86-v6.8-4' fixes into pdx86/for-next to
resolve amd/pmf conflicts.
Diffstat (limited to 'drivers/platform/x86/intel')
| -rw-r--r-- | drivers/platform/x86/intel/int0002_vgpio.c | 2 | ||||
| -rw-r--r-- | drivers/platform/x86/intel/vbtn.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/platform/x86/intel/int0002_vgpio.c b/drivers/platform/x86/intel/int0002_vgpio.c index b6708bab7c53..527d8fbc7cc1 100644 --- a/drivers/platform/x86/intel/int0002_vgpio.c +++ b/drivers/platform/x86/intel/int0002_vgpio.c @@ -196,7 +196,7 @@ static int int0002_probe(struct platform_device *pdev) * IRQs into gpiolib. */ ret = devm_request_irq(dev, irq, int0002_irq, - IRQF_SHARED, "INT0002", chip); + IRQF_ONESHOT | IRQF_SHARED, "INT0002", chip); if (ret) { dev_err(dev, "Error requesting IRQ %d: %d\n", irq, ret); return ret; diff --git a/drivers/platform/x86/intel/vbtn.c b/drivers/platform/x86/intel/vbtn.c index 210b0a81b7ec..084c355c86f5 100644 --- a/drivers/platform/x86/intel/vbtn.c +++ b/drivers/platform/x86/intel/vbtn.c @@ -200,9 +200,6 @@ static void notify_handler(acpi_handle handle, u32 event, void *context) autorelease = val && (!ke_rel || ke_rel->type == KE_IGNORE); sparse_keymap_report_event(input_dev, event, val, autorelease); - - /* Some devices need this to report further events */ - acpi_evaluate_object(handle, "VBDL", NULL, NULL); } /* |