diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-07-11 15:42:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-07-11 15:42:55 -0700 |
| commit | 44696aa3a489d2baf58efa61b37833f100072bee (patch) | |
| tree | 51cd96451c8fa4ffa1829c86ffbf09cbcbbf3f05 /drivers/input/joystick/maplecontrol.c | |
| parent | 59dee6d28756c629f3a0bb56266f80e36ef7c99c (diff) | |
| parent | adea84ee6cdea611146c4251d3c1616f5a09feca (diff) | |
| download | linux-next-44696aa3a489d2baf58efa61b37833f100072bee.tar.gz linux-next-44696aa3a489d2baf58efa61b37833f100072bee.zip | |
Merge tag 'input-for-v7.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
- fix MELFAS MMS114 touchscreen driver to reject invalid touch IDs and
avoid multi-touch slot corruption
- fix a crash in the Sega Dreamcast (Maple) mouse driver when opening
the device, caused by missing driver data
- fixes for Maple drivers (keyboard, mouse, joystick) to properly order
setting driver data and device registration to avoid races
* tag 'input-for-v7.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: mms114 - fix multi-touch slot corruption
Input: maple_keyb - set driver data before registering input device
Input: maplecontrol - set driver data before registering input device
Input: maplemouse - set driver data before registering input device
Input: maplemouse - fix NULL pointer dereference in open()
Diffstat (limited to 'drivers/input/joystick/maplecontrol.c')
| -rw-r--r-- | drivers/input/joystick/maplecontrol.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c index 7f36f73844a9..6293b6e8148b 100644 --- a/drivers/input/joystick/maplecontrol.c +++ b/drivers/input/joystick/maplecontrol.c @@ -112,6 +112,8 @@ static int probe_maple_controller(struct device *dev) pad->dev = idev; pad->mdev = mdev; + maple_set_drvdata(mdev, pad); + idev->open = dc_pad_open; idev->close = dc_pad_close; @@ -146,7 +148,6 @@ static int probe_maple_controller(struct device *dev) goto fail; mdev->driver = mdrv; - maple_set_drvdata(mdev, pad); return 0; |