diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2015-03-20 14:57:00 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-02 14:09:59 +0200 |
| commit | f3586d2f819af6dbe5b08d2a6f1d22b1a97e2b64 (patch) | |
| tree | e5885fca2b4aabb63e604bf9109a899155f6cb44 /drivers/hid/wacom_wac.h | |
| parent | 1fd29be5cede285e673d3ed73d9ed9db59536b33 (diff) | |
| download | linux-f3586d2f819af6dbe5b08d2a6f1d22b1a97e2b64.tar.gz linux-f3586d2f819af6dbe5b08d2a6f1d22b1a97e2b64.tar.bz2 linux-f3586d2f819af6dbe5b08d2a6f1d22b1a97e2b64.zip | |
HID: wacom: remove hardcoded WACOM_QUIRK_MULTI_INPUT
The quirk was added for devices that support both pen and touch. It decides if
a device supports multiple inputs by hardcoded feature type. However, for some
devices, we do not know if they support both before accessing their HID
descriptors.
This patch relies on dynamically assigned device_type to make the decision.
Also, we make it certain that wacom_wac->shared is always created. That is, the
driver will not be loaded if it fails to create wacom_wac->shared.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_wac.h')
| -rw-r--r-- | drivers/hid/wacom_wac.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 1c7d8931f1fa..4700ac994a3b 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -73,11 +73,10 @@ #define WACOM_REPORT_BPAD_TOUCH 16 /* device quirks */ -#define WACOM_QUIRK_MULTI_INPUT 0x0001 -#define WACOM_QUIRK_BBTOUCH_LOWRES 0x0002 -#define WACOM_QUIRK_NO_INPUT 0x0004 -#define WACOM_QUIRK_MONITOR 0x0008 -#define WACOM_QUIRK_BATTERY 0x0010 +#define WACOM_QUIRK_BBTOUCH_LOWRES 0x0001 +#define WACOM_QUIRK_NO_INPUT 0x0002 +#define WACOM_QUIRK_MONITOR 0x0004 +#define WACOM_QUIRK_BATTERY 0x0008 #define WACOM_PEN_FIELD(f) (((f)->logical == HID_DG_STYLUS) || \ ((f)->physical == HID_DG_STYLUS) || \ |