Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 230d8cf2 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Len Brown
Browse files

thinkpad-acpi: don't poll by default any of the reserved hotkeys 



Init hotkey_source_mask late, so that we can make use of
hotkey_reserved_mask to avoid polling any of the reserved
hotkeys by default.

Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 20c9aa46

drivers/platform/x86/thinkpad_acpi.c

+15 −13
Original line number Diff line number Diff line
@@ -3062,19 +3062,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) 
			goto err_exit;

	}



#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL

	if (tp_features.hotkey_mask) {

		hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK

					& ~hotkey_all_mask;

	} else {

		hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK;

	}



	vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,

		    "hotkey source mask 0x%08x, polling freq %u\n",

		    hotkey_source_mask, hotkey_poll_freq);

#endif



#ifdef CONFIG_THINKPAD_ACPI_DEBUGFACILITIES

	if (dbg_wlswemul) {

		tp_features.hotkey_wlsw = 1;
@@ -3186,6 +3173,21 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) 
			| (1 << TP_ACPI_HOTKEYSCAN_FNEND);

	}



#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL

	if (tp_features.hotkey_mask) {

		hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK

					& ~hotkey_all_mask

					& ~hotkey_reserved_mask;

	} else {

		hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK

					& ~hotkey_reserved_mask;

	}



	vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,

		    "hotkey source mask 0x%08x, polling freq %u\n",

		    hotkey_source_mask, hotkey_poll_freq);

#endif



	dbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,

			"enabling firmware HKEY event interface...\n");

	res = hotkey_status_set(true);