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

Commit 9a0f76fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.4-1' of git://git.code.sf.net/p/openipmi/linux-ipmi 

Pull IPMI fix from Corey Minyard:
 "Fix an Oops if an interrupt occurs at startup.  This can happen on
  some hardware"

* tag 'for-linus-4.4-1' of git://git.code.sf.net/p/openipmi/linux-ipmi:
  ipmi: move timer init to before irq is setup
parents d7e35dfa 27f972d3

drivers/char/ipmi/ipmi_si_intf.c

+4 −4
Original line number Diff line number Diff line
@@ -1230,14 +1230,14 @@ static int smi_start_processing(void *send_info, 


	new_smi->intf = intf;



	/* Try to claim any interrupts. */

	if (new_smi->irq_setup)

		new_smi->irq_setup(new_smi);



	/* Set up the timer that drives the interface. */

	setup_timer(&new_smi->si_timer, smi_timeout, (long)new_smi);

	smi_mod_timer(new_smi, jiffies + SI_TIMEOUT_JIFFIES);



	/* Try to claim any interrupts. */

	if (new_smi->irq_setup)

		new_smi->irq_setup(new_smi);



	/*

	 * Check if the user forcefully enabled the daemon.

	 */