|
@@ -545,8 +545,8 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
|
|
((data[6] & 0x0F) << 4) |
|
|
((data[6] & 0x0F) << 4) |
|
|
(data[5] & 0x0F);
|
|
(data[5] & 0x0F);
|
|
}
|
|
}
|
|
- strip1 = (data[1] << 8) | data[2];
|
|
|
|
- strip2 = (data[3] << 8) | data[4];
|
|
|
|
|
|
+ strip1 = ((data[1] & 0x1f) << 8) | data[2];
|
|
|
|
+ strip2 = ((data[3] & 0x1f) << 8) | data[4];
|
|
}
|
|
}
|
|
|
|
|
|
prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |
|
|
prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |
|