diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-18 16:35:05 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-18 16:35:05 -0500 |
| commit | 01234f3c87fff1d83adef8a70fdc18f27d67d75c (patch) | |
| tree | 95a24fe0b257404ca1ee01faee7e2201e3632b9f /drivers/usb/host/whci/asl.c | |
| parent | 8aa4349ad527db56724b1ab9478db65a8065e0bb (diff) | |
| parent | 5955c7a2cfb6a35429adea5dc480002b15ca8cfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/host/whci/asl.c')
| -rw-r--r-- | drivers/usb/host/whci/asl.c | 4 |
1 files changed, 2 insertions, 2 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) | |||
| 227 | * Now that the ASL is updated, complete the removal of any | 227 | * Now that the ASL is updated, complete the removal of any |
| 228 | * removed qsets. | 228 | * removed qsets. |
| 229 | */ | 229 | */ |
| 230 | spin_lock(&whc->lock); | 230 | spin_lock_irq(&whc->lock); |
| 231 | 231 | ||
| 232 | list_for_each_entry_safe(qset, t, &whc->async_removed_list, list_node) { | 232 | list_for_each_entry_safe(qset, t, &whc->async_removed_list, list_node) { |
| 233 | qset_remove_complete(whc, qset); | 233 | qset_remove_complete(whc, qset); |
| 234 | } | 234 | } |
| 235 | 235 | ||
| 236 | spin_unlock(&whc->lock); | 236 | spin_unlock_irq(&whc->lock); |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | /** | 239 | /** |