hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/platform/x86/intel-hid.c
....@@ -458,7 +458,7 @@
458458 static int intel_hid_probe(struct platform_device *device)
459459 {
460460 acpi_handle handle = ACPI_HANDLE(&device->dev);
461
- unsigned long long mode;
461
+ unsigned long long mode, dummy;
462462 struct intel_hid_priv *priv;
463463 acpi_status status;
464464 int err;
....@@ -510,18 +510,15 @@
510510 if (err)
511511 goto err_remove_notify;
512512
513
- if (priv->array) {
514
- unsigned long long dummy;
513
+ intel_button_array_enable(&device->dev, true);
515514
516
- intel_button_array_enable(&device->dev, true);
517
-
518
- /* Call button load method to enable HID power button */
519
- if (!intel_hid_evaluate_method(handle, INTEL_HID_DSM_BTNL_FN,
520
- &dummy)) {
521
- dev_warn(&device->dev,
522
- "failed to enable HID power button\n");
523
- }
524
- }
515
+ /*
516
+ * Call button load method to enable HID power button
517
+ * Always do this since it activates events on some devices without
518
+ * a button array too.
519
+ */
520
+ if (!intel_hid_evaluate_method(handle, INTEL_HID_DSM_BTNL_FN, &dummy))
521
+ dev_warn(&device->dev, "failed to enable HID power button\n");
525522
526523 device_init_wakeup(&device->dev, true);
527524 /*