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: kernel test robot <lkp@01.org> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20171005171035.GA34831@beasthifive-unleashed-5.1
parent
8c20feb606
commit
6ac3526451
|
@ -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)
|
||||||
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) {
|
||||||
|
|
Loading…
Reference in New Issue