lkml.org 
[lkml]   [2017]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] 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>
---
This should apply cleanly on top of tip/timers/core
---
drivers/hsi/clients/ssi_protocol.c | 2 +-
drivers/s390/net/lcs.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
index 67af03d3aeb3..9b167bc6eee4 100644
--- a/drivers/hsi/clients/ssi_protocol.c
+++ b/drivers/hsi/clients/ssi_protocol.c
@@ -499,7 +499,7 @@ static void ssip_rx_wd(struct timer_list *t)
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 hsi_client *cl = ssi->cl;
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 21bba406d5be..b855c6f08e96 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -841,7 +841,6 @@ lcs_lancmd_timeout(struct timer_list *t)
unsigned long flags;

LCS_DBF_TEXT(4, trace, "timeout");
- reply = (struct lcs_reply *) data;
spin_lock_irqsave(&reply->card->lock, flags);
list_for_each_entry_safe(list_reply, r,
&reply->card->lancmd_waiters,list) {
--
2.7.4

--
Kees Cook
Pixel Security

\
 
 \ /
  Last update: 2017-10-05 19:11    [W:0.065 / U:0.076 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site