Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ac35264 authored Oct 05, 2017 by Kees Cook Committed by Thomas Gleixner Oct 05, 2017

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

parent 8c20feb6

drivers/hsi/clients/ssi_protocol.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/s390/net/lcs.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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) {