Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 739e0285 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

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: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 335f8514

drivers/usb/class/cdc-acm.c

+5 −0
Original line number Diff line number Diff line
@@ -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) {

drivers/usb/class/cdc-acm.h

+2 −1
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ struct acm { 
	struct usb_interface *control;			/* control interface */

	struct usb_interface *data;			/* data interface */

	struct tty_struct *tty;				/* the corresponding tty */

	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 */