kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HID: waltop: Extend barrel button fix

Browse source 
Extend Waltop barrel button fix to all models: ignore reported pressure when a
barrel button is pressed, because it is rarely correct. Report zero pressure in
such cases instead.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Nikolai Kondrashov 2012-05-20 21:23:36 +03:00 committed by Jiri Kosina
parent d2ee4dd9a4
commit ed13794925
1 changed files with 7 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drivers/hid/hid-waltop.c
View file

@ -638,28 +638,10 @@ static __u8 sirius_battery_free_tablet_rdesc_fixed[] = {
0xC0 /* End Collection */ 0xC0 /* End Collection */
}; };
struct waltop_state {
u8 pressure0;
u8 pressure1;
};
static int waltop_probe(struct hid_device *hdev, static int waltop_probe(struct hid_device *hdev,
const struct hid_device_id *id) const struct hid_device_id *id)
{ {
int ret; int ret;
struct waltop_state *s;
s = kzalloc(sizeof(*s), GFP_KERNEL);
if (s == NULL) {
hid_err(hdev, "can't allocate device state\n");
ret = -ENOMEM;
goto err;
}
s->pressure0 = 0;
s->pressure1 = 0;
hid_set_drvdata(hdev, s);
ret = hid_parse(hdev); ret = hid_parse(hdev);
if (ret) { if (ret) {
@ -675,7 +657,6 @@ static int waltop_probe(struct hid_device *hdev,
return 0; return 0;
err: err:
kfree(s);
return ret; return ret;
} }
@ -732,27 +713,18 @@ static __u8 *waltop_report_fixup(struct hid_device *hdev, __u8 *rdesc,
static int waltop_raw_event(struct hid_device *hdev, struct hid_report *report, static int waltop_raw_event(struct hid_device *hdev, struct hid_report *report,
u8 *data, int size) u8 *data, int size)
{ {
/* If this is a pen input report of a tablet with PID 0038 */ /* If this is a pen input report */
if (hdev->product == USB_DEVICE_ID_WALTOP_PID_0038 && if (report->type == HID_INPUT_REPORT && report->id == 16 && size >= 8) {
report->type == HID_INPUT_REPORT &&
report->id == 16 &&
size == 8) {
struct waltop_state *s = hid_get_drvdata(hdev);
/* /*
* Ignore maximum pressure reported when a barrel button is * Ignore reported pressure when a barrel button is pressed,
* pressed. * because it is rarely correct.
*/ */
/* If a barrel button is pressed */ /* If a barrel button is pressed */
if ((data[1] & 0xF) > 1) { if ((data[1] & 0xF) > 1) {
/* Use the last known pressure */ /* Report zero pressure */
data[6] = s->pressure0; data[6] = 0;
data[7] = s->pressure1; data[7] = 0;
} else {
/* Remember reported pressure */
s->pressure0 = data[6];
s->pressure1 = data[7];
} }
} }
@ -806,10 +778,7 @@ static int waltop_raw_event(struct hid_device *hdev, struct hid_report *report,
static void waltop_remove(struct hid_device *hdev) static void waltop_remove(struct hid_device *hdev)
{ {
struct waltop_state *s = hid_get_drvdata(hdev);
hid_hw_stop(hdev); hid_hw_stop(hdev);
kfree(s);
} }
static const struct hid_device_id waltop_devices[] = { static const struct hid_device_id waltop_devices[] = {