summaryrefslogtreecommitdiffstats
path: root/drivers/usb/class/cdc-acm.c
diff options
context:
space:
mode:
authorAlan Cox2009-06-11 13:27:50 +0200
committerLinus Torvalds2009-06-11 17:50:57 +0200
commit739e0285cbb162c8ddd0061fda581ee54a34c19a (patch)
tree2749034b5c611ad0b2bdbec1196383bb80548688 /drivers/usb/class/cdc-acm.c
parenttty: Bring the usb tty port structure into more use (diff)
downloadkernel-qcow2-linux-739e0285cbb162c8ddd0061fda581ee54a34c19a.tar.gz
kernel-qcow2-linux-739e0285cbb162c8ddd0061fda581ee54a34c19a.tar.xz
kernel-qcow2-linux-739e0285cbb162c8ddd0061fda581ee54a34c19a.zip
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.c5
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);
#define ACM_READY(acm) (acm && acm->dev && acm->used)
+static const struct tty_port_operations acm_port_ops = {
+};
+
#ifdef VERBOSE_DEBUG
#define verbose 1
#else
@@ -1082,6 +1085,8 @@ skip_normal_probe:
spin_lock_init(&acm->read_lock);
mutex_init(&acm->mutex);
acm->rx_endpoint = usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress);
+ tty_port_init(&acm->port);
+ acm->port.ops = &acm_port_ops;
buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);
if (!buf) {