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

Commit 834dbca5 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

USB: fix spinlock recursion in cdc-acm.c 



this fixes the spinlock recursion issue. The older fix was incomplete.


Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Acked-by: default avatarPete Zaitcev <zaitcev@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 64543652

drivers/usb/class/cdc-acm.c

+4 −4
Original line number Diff line number Diff line
@@ -332,9 +332,9 @@ static void acm_rx_tasklet(unsigned long _acm) 
	if (!ACM_READY(acm))

		return;



	spin_lock(&acm->throttle_lock);

	spin_lock_irqsave(&acm->throttle_lock, flags);

	throttled = acm->throttle;

	spin_unlock(&acm->throttle_lock);

	spin_unlock_irqrestore(&acm->throttle_lock, flags);

	if (throttled)

		return;
@@ -352,9 +352,9 @@ static void acm_rx_tasklet(unsigned long _acm) 
	dbg("acm_rx_tasklet: procesing buf 0x%p, size = %d", buf, buf->size);



	tty_buffer_request_room(tty, buf->size);

	spin_lock(&acm->throttle_lock);

	spin_lock_irqsave(&acm->throttle_lock, flags);

	throttled = acm->throttle;

	spin_unlock(&acm->throttle_lock);

	spin_unlock_irqrestore(&acm->throttle_lock, flags);

	if (!throttled)

		tty_insert_flip_string(tty, buf->base, buf->size);

	tty_flip_buffer_push(tty);