mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 09:20:13 -04:00
Merge branch 'for-7.3/wacom' into for-linus
- report data handling optimization (Ruoyu Wang)
This commit is contained in:
@@ -1192,8 +1192,11 @@ static int int_dist(int x1, int y1, int x2, int y2)
|
||||
static void wacom_intuos_bt_process_data(struct wacom_wac *wacom,
|
||||
unsigned char *data)
|
||||
{
|
||||
memcpy(wacom->data, data, 10);
|
||||
u8 *saved_data = wacom->data;
|
||||
|
||||
wacom->data = data;
|
||||
wacom_intuos_irq(wacom);
|
||||
wacom->data = saved_data;
|
||||
|
||||
input_sync(wacom->pen_input);
|
||||
if (wacom->pad_input)
|
||||
@@ -1202,7 +1205,7 @@ static void wacom_intuos_bt_process_data(struct wacom_wac *wacom,
|
||||
|
||||
static int wacom_intuos_bt_irq(struct wacom_wac *wacom, size_t len)
|
||||
{
|
||||
u8 *data = kmemdup(wacom->data, len, GFP_KERNEL);
|
||||
u8 *data = wacom->data;
|
||||
int i = 1;
|
||||
unsigned power_raw, battery_capacity, bat_charging, ps_connected;
|
||||
|
||||
@@ -1242,7 +1245,6 @@ static int wacom_intuos_bt_irq(struct wacom_wac *wacom, size_t len)
|
||||
break;
|
||||
}
|
||||
|
||||
kfree(data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user