Skip to content

[pull] master from torvalds:master #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jan 2, 2022
Merged

[pull] master from torvalds:master #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f3ccdc
Input: appletouch - initialize work before device registration
pskrgag Dec 31, 2021
bc7ec91
Input: spaceball - fix parsing of movement data packets
ewhac Dec 31, 2021
278218f
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions drivers/input/joystick/spaceball.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <linux/module.h>
#include <linux/input.h>
#include <linux/serio.h>
#include <asm/unaligned.h>

#define DRIVER_DESC "SpaceTec SpaceBall 2003/3003/4000 FLX driver"

Expand Down Expand Up @@ -75,9 +76,15 @@ static void spaceball_process_packet(struct spaceball* spaceball)

case 'D': /* Ball data */
if (spaceball->idx != 15) return;
for (i = 0; i < 6; i++)
/*
* Skip first three bytes; read six axes worth of data.
* Axis values are signed 16-bit big-endian.
*/
data += 3;
for (i = 0; i < ARRAY_SIZE(spaceball_axes); i++) {
input_report_abs(dev, spaceball_axes[i],
(__s16)((data[2 * i + 3] << 8) | data[2 * i + 2]));
(__s16)get_unaligned_be16(&data[i * 2]));
}
break;

case 'K': /* Button data */
Expand Down
4 changes: 2 additions & 2 deletions drivers/input/mouse/appletouch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,15 +916,15 @@ static int atp_probe(struct usb_interface *iface,
set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
set_bit(BTN_LEFT, input_dev->keybit);

INIT_WORK(&dev->work, atp_reinit);

error = input_register_device(dev->input);
if (error)
goto err_free_buffer;

/* save our data pointer in this interface device */
usb_set_intfdata(iface, dev);

INIT_WORK(&dev->work, atp_reinit);

return 0;

err_free_buffer:
Expand Down