diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-01 10:21:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-01 10:21:49 -0800 |
| commit | 278218f6778bc7d6f8b67199446c56cec7ebb841 (patch) | |
| tree | 89438cfa6feb54021ba70f72d3013b81b1583b7f /drivers/input/mouse/appletouch.c | |
| parent | 8008293888188c3923f5bd8a69370dae25ed14e5 (diff) | |
| parent | bc7ec91718c49d938849697cfad98fcd9877cc26 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Two small fixups for spaceball joystick driver and appletouch touchpad
driver"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: spaceball - fix parsing of movement data packets
Input: appletouch - initialize work before device registration
Diffstat (limited to 'drivers/input/mouse/appletouch.c')
| -rw-r--r-- | drivers/input/mouse/appletouch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c index bfa26651c0be..627048bc6a12 100644 --- a/drivers/input/mouse/appletouch.c +++ b/drivers/input/mouse/appletouch.c @@ -916,6 +916,8 @@ 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; @@ -923,8 +925,6 @@ static int atp_probe(struct usb_interface *iface, /* save our data pointer in this interface device */ usb_set_intfdata(iface, dev); - INIT_WORK(&dev->work, atp_reinit); - return 0; err_free_buffer: |