diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-27 20:52:36 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-12-17 15:23:54 -0800 |
commit | 2b6f39e9ee7b6a9fa98f6047b05733053876fdbe (patch) | |
tree | 17462cbbbceda9e7c2b16364f96fc71cb675e1a7 /drivers/input/mouse/focaltech.h | |
parent | ad5307715b2d0afed511b2cad9aed530bbbb236b (diff) | |
download | linux-2b6f39e9ee7b6a9fa98f6047b05733053876fdbe.tar.bz2 |
Input: psmouse - rearrange Focaltech init code
The fact that we were calling focaltech_init() even when Focaltech support
is disabled was confusing. Rearrange the code so that if support is
disabled we continue to fall through the rest of protocol probing code
until we get to full reset that Focaltech devices need to work properly.
Also, replace focaltech_init() with a stub now that it is only called when
protocol is enabled.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Tested-by: Marcin Sochacki <msochacki+kernel@gmail.com>
Tested-by: Till <till2.schaefer@uni-dortmund.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse/focaltech.h')
-rw-r--r-- | drivers/input/mouse/focaltech.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/mouse/focaltech.h b/drivers/input/mouse/focaltech.h index ca61ebff373e..783b28e8e10b 100644 --- a/drivers/input/mouse/focaltech.h +++ b/drivers/input/mouse/focaltech.h @@ -18,6 +18,14 @@ #define _FOCALTECH_H int focaltech_detect(struct psmouse *psmouse, bool set_properties); + +#ifdef CONFIG_MOUSE_PS2_FOCALTECH int focaltech_init(struct psmouse *psmouse); +#else +static inline int focaltech_init(struct psmouse *psmouse) +{ + return -ENOSYS; +} +#endif #endif |