summaryrefslogtreecommitdiffstats
path: root/drivers/hsi
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-05 10:10:35 -0700
committerThomas Gleixner <tglx@linutronix.de>2017-10-05 22:04:48 +0200
commit6ac35264513e43634f127a92057f04a4b3c5cdbb (patch)
tree27399a3cc671ede125822493a516ad83cabc16eb /drivers/hsi
parent8c20feb60604d91a29cd7fef8ac758bd92d9fd2c (diff)
downloadlinux-stable-6ac35264513e43634f127a92057f04a4b3c5cdbb.tar.gz
linux-stable-6ac35264513e43634f127a92057f04a4b3c5cdbb.tar.bz2
linux-stable-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
Diffstat (limited to 'drivers/hsi')
-rw-r--r--drivers/hsi/clients/ssi_protocol.c2
1 files changed, 1 insertions, 1 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;