Skip to content

Commit

Permalink
Merge tag 'for-linus-4.4-1' of git://git.code.sf.net/p/openipmi/linux…
Browse files Browse the repository at this point in the history
…-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
  • Loading branch information
Linus Torvalds committed Dec 9, 2015
2 parents d7e35df + 27f972d commit 9a0f76f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/char/ipmi/ipmi_si_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down

0 comments on commit 9a0f76f

Please sign in to comment.