diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
| commit | f0006314d37639714da9658cf4ff3f1f9f420764 (patch) | |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 /drivers/usb/class | |
| parent | a177ba3b7a08beef3f0fe74efa0f90701891945a (diff) | |
| parent | 1bd55a436f1f90de0e7f476e514e01bd67497b88 (diff) | |
Merge branch 'imx' into devel
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'drivers/usb/class')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 63c34043b4d9..c3201affa0b6 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1125,9 +1125,6 @@ static void stop_data_traffic(struct acm *acm) | |||
| 1125 | for (i = 0; i < acm->rx_buflimit; i++) | 1125 | for (i = 0; i < acm->rx_buflimit; i++) |
| 1126 | usb_kill_urb(acm->ru[i].urb); | 1126 | usb_kill_urb(acm->ru[i].urb); |
| 1127 | 1127 | ||
| 1128 | INIT_LIST_HEAD(&acm->filled_read_bufs); | ||
| 1129 | INIT_LIST_HEAD(&acm->spare_read_bufs); | ||
| 1130 | |||
| 1131 | tasklet_enable(&acm->urb_task); | 1128 | tasklet_enable(&acm->urb_task); |
| 1132 | 1129 | ||
| 1133 | cancel_work_sync(&acm->work); | 1130 | cancel_work_sync(&acm->work); |