From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Dec 2017 01:01:59 +0000 (-0800)
Subject: Merge tag 'for-linus-4.15-2' of git://github.com/cminyard/linux-ipmi
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bfb529ee790f5c3b1efd892d48c0b8d1449849f4;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'for-linus-4.15-2' of git://github.com/cminyard/linux-ipmi

Pull IPMI fixes from Corey Minyard.

* tag 'for-linus-4.15-2' of git://github.com/cminyard/linux-ipmi:
  ipmi_si: fix crash on parisc
  ipmi_si: Fix oops with PCI devices
  ipmi: Stop timers before cleaning up the module
---

bfb529ee790f5c3b1efd892d48c0b8d1449849f4
diff --cc drivers/char/ipmi/ipmi_si_intf.c
index 779869ed32b1,99b0513bb55b..71fad747c0c7
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@@ -1166,7 -1165,8 +1165,8 @@@ static int smi_start_processing(voi
  	new_smi->intf = intf;
  
  	/* Set up the timer that drives the interface. */
 -	setup_timer(&new_smi->si_timer, smi_timeout, (long)new_smi);
 +	timer_setup(&new_smi->si_timer, smi_timeout, 0);
+ 	new_smi->timer_can_start = true;
  	smi_mod_timer(new_smi, jiffies + SI_TIMEOUT_JIFFIES);
  
  	/* Try to claim any interrupts. */