diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /drivers/usb/host/whci/asl.c | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/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 | /** |