]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
s390/tape: fix timer initialization in tape_std_assign()
authorSven Schnelle <svens@linux.ibm.com>
Tue, 2 Nov 2021 09:55:30 +0000 (10:55 +0100)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:48:40 +0000 (09:48 +0100)
commit90b45ada043dab1b6c677f6f6c73bb9d83403b75
treed890e27756437a3979e0def4f4ccb4463ec59177
parent720b5954cdf47e18b06af0cf5d51a89e5e39578a
s390/tape: fix timer initialization in tape_std_assign()

BugLink: https://bugs.launchpad.net/bugs/1951822
commit 213fca9e23b59581c573d558aa477556f00b8198 upstream.

commit 9c6c273aa424 ("timer: Remove init_timer_on_stack() in favor
of timer_setup_on_stack()") changed the timer setup from
init_timer_on_stack(() to timer_setup(), but missed to change the
mod_timer() call. And while at it, use msecs_to_jiffies() instead
of the open coded timeout calculation.

Cc: stable@vger.kernel.org
Fixes: 9c6c273aa424 ("timer: Remove init_timer_on_stack() in favor of timer_setup_on_stack()")
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/s390/char/tape_std.c