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

Commit 7584f2eb authored by Thomas Pugliese's avatar Thomas Pugliese Committed by Greg Kroah-Hartman
Browse files

usb: wusbcore: convert nested lock to use spin_lock instead of spin_lock_irq 



Nesting a spin_lock_irq/unlock_irq inside a lock that has already
disabled interrupts will enable interrupts before we are ready when
spin_unlock_irq is called.  This patch converts the inner lock to use
spin_lock and spin_unlock instead.

Signed-off-by: default avatarThomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c996b937

drivers/usb/wusbcore/wa-xfer.c

+2 −2
Original line number Diff line number Diff line
@@ -2390,10 +2390,10 @@ static void wa_xfer_result_chew(struct wahc *wa, struct wa_xfer *xfer, 
		done) {



		dev_info(dev, "Control EP stall.  Queue delayed work.\n");

		spin_lock_irq(&wa->xfer_list_lock);

		spin_lock(&wa->xfer_list_lock);

		/* move xfer from xfer_list to xfer_errored_list. */

		list_move_tail(&xfer->list_node, &wa->xfer_errored_list);

		spin_unlock_irq(&wa->xfer_list_lock);

		spin_unlock(&wa->xfer_list_lock);

		spin_unlock_irqrestore(&xfer->lock, flags);

		queue_work(wusbd, &wa->xfer_error_work);

	} else {