diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2025-06-11 09:01:34 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2025-06-11 09:01:34 +0200 |
| commit | c598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5 (patch) | |
| tree | a5b6f4655cde4f19b6b157aa455723c0329bd719 /drivers/input/joystick/db9.c | |
| parent | 29a9b3a504c0d18bcc7f0547371409e9dcbc045e (diff) | |
| parent | 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 (diff) | |
| download | linux-next-c598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5.tar.gz linux-next-c598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging to forward to v6.16-rc1
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/input/joystick/db9.c')
| -rw-r--r-- | drivers/input/joystick/db9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c index d7a253835889..d5c67a927404 100644 --- a/drivers/input/joystick/db9.c +++ b/drivers/input/joystick/db9.c @@ -351,7 +351,7 @@ static int db9_saturn(int mode, struct parport *port, struct input_dev *devs[]) static void db9_timer(struct timer_list *t) { - struct db9 *db9 = from_timer(db9, t, timer); + struct db9 *db9 = timer_container_of(db9, t, timer); struct parport *port = db9->pd->port; struct input_dev *dev = db9->dev[0]; struct input_dev *dev2 = db9->dev[1]; |