diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
| commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
| tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /drivers/usb/class/cdc-acm.h | |
| parent | e7250b8ae3870f37f660c2f65cafcaba85e3bfd3 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.gz linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.bz2 linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.zip | |
Merge commit 'v2.6.27-rc6' into timers/hpet
Diffstat (limited to 'drivers/usb/class/cdc-acm.h')
| -rw-r--r-- | drivers/usb/class/cdc-acm.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index 85c3aaaab7c5..1f95e7aa1b66 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h @@ -106,8 +106,6 @@ struct acm { struct list_head spare_read_bufs; struct list_head filled_read_bufs; int write_used; /* number of non-empty write buffers */ - int write_ready; /* write urb is not running */ - int old_ready; int processing; int transmitting; spinlock_t write_lock; @@ -115,6 +113,7 @@ struct acm { struct usb_cdc_line_coding line; /* bits, stop, parity */ struct work_struct work; /* work queue entry for line discipline waking up */ struct work_struct waker; + wait_queue_head_t drain_wait; /* close processing */ struct tasklet_struct urb_task; /* rx processing */ spinlock_t throttle_lock; /* synchronize throtteling and read callback */ unsigned int ctrlin; /* input control lines (DCD, DSR, RI, break, overruns) */ |