From c4eb7c5017c5a7b20a6bc07e88ce5bf66721e3d8 Mon Sep 17 00:00:00 2001 From: Florian Ragwitz Date: Tue, 27 Apr 2010 00:47:04 -0700 Subject: [PATCH] --- yaml --- r: 190587 b: refs/heads/master c: f81bc788ff91d4efd4baf88b2c29713838caa8e5 h: refs/heads/master i: 190585: 9d097e72ba5d811de5c7d764d6b0c8a7a47cd5e0 190583: bebc5b48d54458eae22750d64cd5893c638c4e35 v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/elantech.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 13494b8561a9..74874447dadd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 225c61aad38b12924b3df5f4ef43150c0d6bae8c +refs/heads/master: f81bc788ff91d4efd4baf88b2c29713838caa8e5 diff --git a/trunk/drivers/input/mouse/elantech.c b/trunk/drivers/input/mouse/elantech.c index 28eba48e68fd..095bd388c6dd 100644 --- a/trunk/drivers/input/mouse/elantech.c +++ b/trunk/drivers/input/mouse/elantech.c @@ -24,6 +24,10 @@ printk(KERN_DEBUG format, ##arg); \ } while (0) +static bool force_elantech; +module_param_named(force_elantech, force_elantech, bool, 0644); +MODULE_PARM_DESC(force_elantech, "Force the Elantech PS/2 protocol extension to be used, 1 = enabled, 0 = disabled (default)."); + /* * Send a Synaptics style sliced query command */ @@ -595,8 +599,12 @@ int elantech_detect(struct psmouse *psmouse, bool set_properties) param[0], param[1], param[2]); if (param[0] == 0 || param[1] != 0) { - pr_debug("elantech.c: Probably not a real Elantech touchpad. Aborting.\n"); - return -1; + if (!force_elantech) { + pr_debug("elantech.c: Probably not a real Elantech touchpad. Aborting.\n"); + return -1; + } + + pr_debug("elantech.c: Probably not a real Elantech touchpad. Enabling anyway due to force_elantech.\n"); } if (set_properties) {