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

Commit ee9a4ae7 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Felipe Balbi
Browse files

usb: usbtest: use irqsave() in USB's complete callback 



The USB completion callback does not disable interrupts while acquiring
the lock. We want to remove the local_irq_disable() invocation from
__usb_hcd_giveback_urb() and therefore it is required for the callback
handler to disable the interrupts while acquiring the lock.
The callback may be invoked either in IRQ or BH context depending on the
USB host controller.
Use the _irqsave() variant of the locking primitives.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent bf594c10

drivers/usb/misc/usbtest.c

+6 −4
Original line number Diff line number Diff line
@@ -1082,11 +1082,12 @@ static void ctrl_complete(struct urb *urb) 
	struct usb_ctrlrequest	*reqp;

	struct subcase		*subcase;

	int			status = urb->status;

	unsigned long		flags;



	reqp = (struct usb_ctrlrequest *)urb->setup_packet;

	subcase = container_of(reqp, struct subcase, setup);



	spin_lock(&ctx->lock);

	spin_lock_irqsave(&ctx->lock, flags);

	ctx->count--;

	ctx->pending--;
@@ -1185,7 +1186,7 @@ static void ctrl_complete(struct urb *urb) 
	/* signal completion when nothing's queued */

	if (ctx->pending == 0)

		complete(&ctx->complete);

	spin_unlock(&ctx->lock);

	spin_unlock_irqrestore(&ctx->lock, flags);

}



static int
@@ -1917,8 +1918,9 @@ struct transfer_context { 
static void complicated_callback(struct urb *urb)

{

	struct transfer_context	*ctx = urb->context;

	unsigned long flags;



	spin_lock(&ctx->lock);

	spin_lock_irqsave(&ctx->lock, flags);

	ctx->count--;



	ctx->packet_count += urb->number_of_packets;
@@ -1958,7 +1960,7 @@ static void complicated_callback(struct urb *urb) 
		complete(&ctx->done);

	}

done:

	spin_unlock(&ctx->lock);

	spin_unlock_irqrestore(&ctx->lock, flags);

}



static struct urb *iso_alloc_urb(