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

diff --cc drivers/char/ipmi/ipmi_si_intf.c
index 779869ed32b1516261e80fffd440b3ca1e1132ea,99b0513bb55b07b48c5ef52ff3e5fb35b38db8db..71fad747c0c7c1052cc19ee3bad0568b4a80c55b
--- 1/drivers/char/ipmi/ipmi_si_intf.c
--- 2/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. */