Commit 6ac35264 authored by Kees Cook's avatar Kees Cook Committed by Thomas Gleixner

timer: Fix two mistakes in callback conversions

Two errors found their way into the timer callback conversions that
weren't noticed with x86 allmodconfig.
Reported-by: default avatarkernel test robot <lkp@01.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20171005171035.GA34831@beast
parent 8c20feb6
...@@ -499,7 +499,7 @@ static void ssip_rx_wd(struct timer_list *t) ...@@ -499,7 +499,7 @@ static void ssip_rx_wd(struct timer_list *t)
ssip_error(cl); ssip_error(cl);
} }
static void ssip_tx_wd(unsigned long data) static void ssip_tx_wd(struct timer_list *t)
{ {
struct ssi_protocol *ssi = from_timer(ssi, t, tx_wd); struct ssi_protocol *ssi = from_timer(ssi, t, tx_wd);
struct hsi_client *cl = ssi->cl; struct hsi_client *cl = ssi->cl;
......
...@@ -841,7 +841,6 @@ lcs_lancmd_timeout(struct timer_list *t) ...@@ -841,7 +841,6 @@ lcs_lancmd_timeout(struct timer_list *t)
unsigned long flags; unsigned long flags;
LCS_DBF_TEXT(4, trace, "timeout"); LCS_DBF_TEXT(4, trace, "timeout");
reply = (struct lcs_reply *) data;
spin_lock_irqsave(&reply->card->lock, flags); spin_lock_irqsave(&reply->card->lock, flags);
list_for_each_entry_safe(list_reply, r, list_for_each_entry_safe(list_reply, r,
&reply->card->lancmd_waiters,list) { &reply->card->lancmd_waiters,list) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment