]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Nov 2021 10:36:18 +0000 (11:36 +0100)
commit3edf40b5e75a2b69d6e88022a87b9a4aeb29c1d3
treea0667ac55438aaebc9aacb1f9d5a44daf27d9b35
parentd73ae146255f655d70395aca427c3b362da90adc
s390/tape: fix timer initialization in tape_std_assign()

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>
drivers/s390/char/tape_std.c