Skip to contentSkip to conversation

platform/x86: asus-wmi: add SERIO_I8042 dependency

PATCH In review Arnd Bergmann 2 participants 2 messages Oct 12, 2016 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: asus-wmi: add SERIO_I8042 dependency

A recent bugfix added a call to i8042_install_filter but did not add the dependency, leading to possible link errors:

drivers/platform/built-in.o: In function `asus_nb_wmi_quirks':
asus-nb-wmi.c:(.text+0x23af): undefined reference to `i8042_install_filter'

This adds a dependency on SERIO_I8042||SERIO_I8042=n to indicate that we can build the driver when the i8042 driver is disabled, but it cannot be built-in when that is a loadable module.

Fixes b5643539b825 ("platform/x86: asus-wmi: Filter buggy scan codes on ASUS Q500A")
---
 drivers/platform/x86/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/platform/x86/Kconfig +1 -0
index 9756c8354b37..6bca28472605 100644
@@ -576,6 +576,7 @@ config ASUS_WMI
 config ASUS_NB_WMI
 	tristate "Asus Notebook WMI Driver"
 	depends on ASUS_WMI
+	depends on SERIO_I8042 || SERIO_I8042 = n
 	---help---
 	  This is a driver for newer Asus notebooks. It adds extra features
 	  like wireless radio and bluetooth control, leds, hotkeys, backlight...
Signature · 1 line
2.9.0
#1 lore raw
Quoted 6 lines · Arnd Bergmann

A recent bugfix added a call to i8042_install_filter but did not add the dependency, leading to possible link errors:

drivers/platform/built-in.o: In function `asus_nb_wmi_quirks':
asus-nb-wmi.c:(.text+0x23af): undefined reference to `i8042_install_filter'

Quoted 6 lines

This adds a dependency on SERIO_I8042||SERIO_I8042=n to indicate that we can build the driver when the i8042 driver is disabled, but it cannot be built-in when that is a loadable module.

Fixes b5643539b825 ("platform/x86: asus-wmi: Filter buggy scan codes on ASUS Q500A")

Thanks again Arnd, queued to testing. Will try to include in a pull request within the merge window, but travel may push it out to early next week if connectivity or travel goes south.

Quoted 20 lines
---
 drivers/platform/x86/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/platform/x86/Kconfig +1 -0
index 9756c8354b37..6bca28472605 100644
@@ -576,6 +576,7 @@ config ASUS_WMI
 config ASUS_NB_WMI
 	tristate "Asus Notebook WMI Driver"
 	depends on ASUS_WMI
+	depends on SERIO_I8042 || SERIO_I8042 = n
 	---help---
 	  This is a driver for newer Asus notebooks. It adds extra features
 	  like wireless radio and bluetooth control, leds, hotkeys, backlight...
Signature · 1 line
2.9.0
Signature · 2 lines
Darren Hart
Intel Open Source Technology Center