summaryrefslogtreecommitdiffstats
path: root/drivers/usb/class/cdc-acm.h
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.h
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.h')
-rw-r--r--drivers/usb/class/cdc-acm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 1f95e7aa1b66..19967cdb2691 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -90,7 +90,8 @@ struct acm {
struct usb_interface *control; /* control interface */
struct usb_interface *data; /* data interface */
struct tty_struct *tty; /* the corresponding tty */
- struct urb *ctrlurb; /* urbs */
+ struct tty_port port; /* our tty port data */
+ struct urb *ctrlurb; /* urbs */
u8 *ctrl_buffer; /* buffers of urbs */
dma_addr_t ctrl_dma; /* dma handles of buffers */
u8 *country_codes; /* country codes from device */