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

Commit 177294d1 authored by Hironobu Ishii's avatar Hironobu Ishii Committed by Linus Torvalds
Browse files

[PATCH] ipmi: fix inconsistent spinlock usage 



Part of a patch was accidentally reverted, this corrects an
inconsistent spinlock use in the IPMI message handler.

Signed-off-by: default avatarHironobu Ishii <hishii@soft.fujitsu.com>
Signed-off-by: default avatarCorey Minyard <minyard@acm.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9b80b11c

drivers/char/ipmi/ipmi_msghandler.c

+3 −3
Original line number Diff line number Diff line
@@ -2648,7 +2648,7 @@ void ipmi_smi_msg_received(ipmi_smi_t intf, 
	spin_lock_irqsave(&intf->waiting_msgs_lock, flags);

	if (!list_empty(&intf->waiting_msgs)) {

		list_add_tail(&msg->link, &intf->waiting_msgs);

		spin_unlock(&intf->waiting_msgs_lock);

		spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);

		goto out;

	}

	spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
@@ -2657,9 +2657,9 @@ void ipmi_smi_msg_received(ipmi_smi_t intf, 
	if (rv > 0) {

		/* Could not handle the message now, just add it to a

                   list to handle later. */

		spin_lock(&intf->waiting_msgs_lock);

		spin_lock_irqsave(&intf->waiting_msgs_lock, flags);

		list_add_tail(&msg->link, &intf->waiting_msgs);

		spin_unlock(&intf->waiting_msgs_lock);

		spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);

	} else if (rv == 0) {

		ipmi_free_smi_msg(msg);

	}