diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-06-11 07:27:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 11:50:57 -0400 |
| commit | 739e0285cbb162c8ddd0061fda581ee54a34c19a (patch) | |
| tree | 2749034b5c611ad0b2bdbec1196383bb80548688 /drivers/usb/class/cdc-acm.c | |
| parent | 335f8514f200e63d689113d29cb7253a5c282967 (diff) | |
tty: Update cdc_acm
The CDC ACM driver uses the tty layer correctly so needs conversion. Start by
adding and initializing the port structures.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 7a1164dd1d37..41d4ca527f82 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -89,6 +89,9 @@ static DEFINE_MUTEX(open_mutex); | |||
| 89 | 89 | ||
| 90 | #define ACM_READY(acm) (acm && acm->dev && acm->used) | 90 | #define ACM_READY(acm) (acm && acm->dev && acm->used) |
| 91 | 91 | ||
| 92 | static const struct tty_port_operations acm_port_ops = { | ||
| 93 | }; | ||
| 94 | |||
| 92 | #ifdef VERBOSE_DEBUG | 95 | #ifdef VERBOSE_DEBUG |
| 93 | #define verbose 1 | 96 | #define verbose 1 |
| 94 | #else | 97 | #else |
| @@ -1082,6 +1085,8 @@ skip_normal_probe: | |||
| 1082 | spin_lock_init(&acm->read_lock); | 1085 | spin_lock_init(&acm->read_lock); |
| 1083 | mutex_init(&acm->mutex); | 1086 | mutex_init(&acm->mutex); |
| 1084 | acm->rx_endpoint = usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress); | 1087 | acm->rx_endpoint = usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress); |
| 1088 | tty_port_init(&acm->port); | ||
| 1089 | acm->port.ops = &acm_port_ops; | ||
| 1085 | 1090 | ||
| 1086 | buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma); | 1091 | buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma); |
| 1087 | if (!buf) { | 1092 | if (!buf) { |
