diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-27 10:20:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-27 10:20:39 -0700 |
commit | ed3f4e239834317934cc73a187e27e44b217056b (patch) | |
tree | 6990e64bde453357c1a58f1378c6c4dace9b9383 /drivers/input/touchscreen/wm97xx-core.c | |
parent | c7b7eefa57ae3c8802fdec7d07ac4df6c49d1e7a (diff) | |
parent | cacd9759eea2f1c7e8792ecd91ed4602f963b1a5 (diff) | |
download | linux-ed3f4e239834317934cc73a187e27e44b217056b.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Just random driver fixups, nothing exiting"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics - avoid using uninitialized variable when probing
Input: xen-kbdfront - mark expected switch fall-through
Input: atmel_mxt_ts - mark expected switch fall-through
Input: cyapa - mark expected switch fall-throughs
Input: wm97xx-ts - fix exit path
Input: of_touchscreen - add support for touchscreen-min-x|y
Input: Fix DIR-685 touchkeys MAINTAINERS entry
Input: elants_i2c - use DMA safe i2c when possible
Input: silead - try firmware reload after unsuccessful resume
Input: st1232 - set INPUT_PROP_DIRECT property
Input: xilinx_ps2 - convert to using %pOFn instead of device_node.name
Input: atmel_mxt_ts - fix multiple <linux/property.h> includes
Input: sun4i-lradc - convert to using %pOFn instead of device_node.name
Input: pwm-vibrator - correct pwms in DT binding example
Diffstat (limited to 'drivers/input/touchscreen/wm97xx-core.c')
-rw-r--r-- | drivers/input/touchscreen/wm97xx-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c index 2566b4d8b342..73856c2a8ac0 100644 --- a/drivers/input/touchscreen/wm97xx-core.c +++ b/drivers/input/touchscreen/wm97xx-core.c @@ -929,7 +929,8 @@ static int __init wm97xx_init(void) static void __exit wm97xx_exit(void) { - driver_unregister(&wm97xx_driver); + if (IS_BUILTIN(CONFIG_AC97_BUS)) + driver_unregister(&wm97xx_driver); platform_driver_unregister(&wm97xx_mfd_driver); } |