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

Commit 11df5864 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb 

* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
  wusb: whci-hcd: always lock whc->lock with interrupts disabled
parents 2f609712 a3c1239e

drivers/usb/host/whci/asl.c

+2 −2
Original line number Diff line number Diff line
@@ -227,13 +227,13 @@ void scan_async_work(struct work_struct *work) 
	 * Now that the ASL is updated, complete the removal of any

	 * removed qsets.

	 */

	spin_lock(&whc->lock);

	spin_lock_irq(&whc->lock);



	list_for_each_entry_safe(qset, t, &whc->async_removed_list, list_node) {

		qset_remove_complete(whc, qset);

	}



	spin_unlock(&whc->lock);

	spin_unlock_irq(&whc->lock);

}



/**

drivers/usb/host/whci/pzl.c

+2 −2
Original line number Diff line number Diff line
@@ -255,13 +255,13 @@ void scan_periodic_work(struct work_struct *work) 
	 * Now that the PZL is updated, complete the removal of any

	 * removed qsets.

	 */

	spin_lock(&whc->lock);

	spin_lock_irq(&whc->lock);



	list_for_each_entry_safe(qset, t, &whc->periodic_removed_list, list_node) {

		qset_remove_complete(whc, qset);

	}



	spin_unlock(&whc->lock);

	spin_unlock_irq(&whc->lock);

}



/**