diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:05:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:05:59 -0800 |
| commit | 11df5864075f763ec0d1fdecd6a3f0af7d09a553 (patch) | |
| tree | 829d55b46035f688c84df27b33d760cbcbdd58fe /drivers | |
| parent | FRV: __pte_to_swp_entry doesn't expand correctly (diff) | |
| parent | wusb: whci-hcd: always lock whc->lock with interrupts disabled (diff) | |
| download | linux-dev-11df5864075f763ec0d1fdecd6a3f0af7d09a553.tar.xz linux-dev-11df5864075f763ec0d1fdecd6a3f0af7d09a553.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/whci/asl.c | 4 | ||||
| -rw-r--r-- | drivers/usb/host/whci/pzl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/whci/asl.c b/drivers/usb/host/whci/asl.c index 2291c5f5af51..958751ccea43 100644 --- a/drivers/usb/host/whci/asl.c +++ b/drivers/usb/host/whci/asl.c @@ -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); } /** diff --git a/drivers/usb/host/whci/pzl.c b/drivers/usb/host/whci/pzl.c index 7dc85a0bee7c..df8b85f07092 100644 --- a/drivers/usb/host/whci/pzl.c +++ b/drivers/usb/host/whci/pzl.c @@ -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); } /** |