diff options
| author | Kees Cook | 2017-10-05 19:10:35 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2017-10-05 22:04:48 +0200 |
| commit | 6ac35264513e43634f127a92057f04a4b3c5cdbb (patch) | |
| tree | 27399a3cc671ede125822493a516ad83cabc16eb | |
| parent | workqueue: Convert callback to use from_timer() (diff) | |
| download | kernel-qcow2-linux-6ac35264513e43634f127a92057f04a4b3c5cdbb.tar.gz kernel-qcow2-linux-6ac35264513e43634f127a92057f04a4b3c5cdbb.tar.xz kernel-qcow2-linux-6ac35264513e43634f127a92057f04a4b3c5cdbb.zip | |
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@beast
| -rw-r--r-- | drivers/hsi/clients/ssi_protocol.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/lcs.c | 1 |
2 files changed, 1 insertions, 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) { |