Skip to content

Commit 917a9e2

Browse files
dtorgregkh
authored andcommitted
Input: maplemouse - set driver data before registering input device
commit 738f24b upstream. Set maple driver data before calling input_register_device() to ensure that it is available if the device is opened immediately and the callback is triggered. Cc: stable@vger.kernel.org Assisted-by: Antigravity:gemini-3.5-flash Tested-by: Florian Fuchs <fuchsfl@gmail.com> Link: https://patch.msgid.link/akNXw45L_8bxD6QV@google.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 42c5a86 commit 917a9e2

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/input/mouse/maplemouse.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ static int probe_maple_mouse(struct device *dev)
8888
mse->dev = input_dev;
8989
mse->mdev = mdev;
9090

91+
maple_set_drvdata(mdev, mse);
92+
9193
input_set_drvdata(input_dev, mse);
9294
input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
9395
input_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
@@ -103,12 +105,12 @@ static int probe_maple_mouse(struct device *dev)
103105
goto fail_register;
104106

105107
mdev->driver = mdrv;
106-
maple_set_drvdata(mdev, mse);
107108

108109
return error;
109110

110111
fail_register:
111112
input_free_device(input_dev);
113+
maple_set_drvdata(mdev, NULL);
112114
fail_nomem:
113115
kfree(mse);
114116
fail:

0 commit comments

Comments
 (0)