diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /drivers/usb/host/whci/pzl.c | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
Diffstat (limited to 'drivers/usb/host/whci/pzl.c')
| -rw-r--r-- | drivers/usb/host/whci/pzl.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 255 | * Now that the PZL is updated, complete the removal of any | 255 | * Now that the PZL is updated, complete the removal of any |
| 256 | * removed qsets. | 256 | * removed qsets. |
| 257 | */ | 257 | */ |
| 258 | spin_lock(&whc->lock); | 258 | spin_lock_irq(&whc->lock); |
| 259 | 259 | ||
| 260 | list_for_each_entry_safe(qset, t, &whc->periodic_removed_list, list_node) { | 260 | list_for_each_entry_safe(qset, t, &whc->periodic_removed_list, list_node) { |
| 261 | qset_remove_complete(whc, qset); | 261 | qset_remove_complete(whc, qset); |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | spin_unlock(&whc->lock); | 264 | spin_unlock_irq(&whc->lock); |
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | /** | 267 | /** |