tty: Clean up the ACM driver to CodingStyle (6e47e069) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/usb/class/cdc-acm.c

+160 −131

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,8 @@
	* v0.9 - thorough cleaning, URBification, almost a rewrite		* v0.9 - thorough cleaning, URBification, almost a rewrite
	* v0.10 - some more cleanups		* v0.10 - some more cleanups
	* v0.11 - fixed flow control, read error doesn't stop reads		* v0.11 - fixed flow control, read error doesn't stop reads
	* v0.12 - added TIOCM ioctls, added break handling, made struct acm kmalloced		* v0.12 - added TIOCM ioctls, added break handling, made struct acm
			* kmalloced
	* v0.13 - added termios, added hangup		* v0.13 - added termios, added hangup
	* v0.14 - sized down struct acm		* v0.14 - sized down struct acm
	* v0.15 - fixed flow control again - characters could be lost		* v0.15 - fixed flow control again - characters could be lost
	@@ -102,13 +103,15 @@ static const struct tty_port_operations acm_port_ops = {
	* Functions for ACM control messages.		* Functions for ACM control messages.
	*/		*/

	static int acm_ctrl_msg(struct acm acm, int request, int value, void buf, int len)		static int acm_ctrl_msg(struct acm *acm, int request, int value,
			void *buf, int len)
	{		{
	int retval = usb_control_msg(acm->dev, usb_sndctrlpipe(acm->dev, 0),		int retval = usb_control_msg(acm->dev, usb_sndctrlpipe(acm->dev, 0),
	request, USB_RT_ACM, value,		request, USB_RT_ACM, value,
	acm->control->altsetting[0].desc.bInterfaceNumber,		acm->control->altsetting[0].desc.bInterfaceNumber,
	buf, len, 5000);		buf, len, 5000);
	dbg("acm_control_msg: rq: 0x%02x val: %#x len: %#x result: %d", request, value, len, retval);		dbg("acm_control_msg: rq: 0x%02x val: %#x len: %#x result: %d",
			request, value, len, retval);
	return retval < 0 ? retval : 0;		return retval < 0 ? retval : 0;
	}		}

	@@ -153,9 +156,8 @@ static int acm_wb_is_avail(struct acm *acm)

	n = ACM_NW;		n = ACM_NW;
	spin_lock_irqsave(&acm->write_lock, flags);		spin_lock_irqsave(&acm->write_lock, flags);
	for (i = 0; i < ACM_NW; i++) {		for (i = 0; i < ACM_NW; i++)
	n -= acm->wb[i].use;		n -= acm->wb[i].use;
	}
	spin_unlock_irqrestore(&acm->write_lock, flags);		spin_unlock_irqrestore(&acm->write_lock, flags);
	return n;		return n;
	}		}
	@@ -186,7 +188,8 @@ static int acm_start_wb(struct acm acm, struct acm_wb wb)
	wb->urb->transfer_buffer_length = wb->len;		wb->urb->transfer_buffer_length = wb->len;
	wb->urb->dev = acm->dev;		wb->urb->dev = acm->dev;

	if ((rc = usb_submit_urb(wb->urb, GFP_ATOMIC)) < 0) {		rc = usb_submit_urb(wb->urb, GFP_ATOMIC);
			if (rc < 0) {
	dbg("usb_submit_urb(write bulk) failed: %d", rc);		dbg("usb_submit_urb(write bulk) failed: %d", rc);
	acm_write_done(acm, wb);		acm_write_done(acm, wb);
	}		}
	@@ -291,10 +294,9 @@ static void acm_ctrl_irq(struct urb *urb)

	data = (unsigned char *)(dr + 1);		data = (unsigned char *)(dr + 1);
	switch (dr->bNotificationType) {		switch (dr->bNotificationType) {

	case USB_CDC_NOTIFY_NETWORK_CONNECTION:		case USB_CDC_NOTIFY_NETWORK_CONNECTION:
			dbg("%s network", dr->wValue ?
	dbg("%s network", dr->wValue ? "connected to" : "disconnected from");		"connected to" : "disconnected from");
	break;		break;

	case USB_CDC_NOTIFY_SERIAL_STATE:		case USB_CDC_NOTIFY_SERIAL_STATE:
	@@ -313,11 +315,13 @@ static void acm_ctrl_irq(struct urb *urb)
	acm->ctrlin = newctrl;		acm->ctrlin = newctrl;

	dbg("input control lines: dcd%c dsr%c break%c ring%c framing%c parity%c overrun%c",		dbg("input control lines: dcd%c dsr%c break%c ring%c framing%c parity%c overrun%c",
	acm->ctrlin & ACM_CTRL_DCD ? '+' : '-', acm->ctrlin & ACM_CTRL_DSR ? '+' : '-',		acm->ctrlin & ACM_CTRL_DCD ? '+' : '-',
	acm->ctrlin & ACM_CTRL_BRK ? '+' : '-', acm->ctrlin & ACM_CTRL_RI ? '+' : '-',		acm->ctrlin & ACM_CTRL_DSR ? '+' : '-',
	acm->ctrlin & ACM_CTRL_FRAMING ? '+' : '-', acm->ctrlin & ACM_CTRL_PARITY ? '+' : '-',		acm->ctrlin & ACM_CTRL_BRK ? '+' : '-',
			acm->ctrlin & ACM_CTRL_RI ? '+' : '-',
			acm->ctrlin & ACM_CTRL_FRAMING ? '+' : '-',
			acm->ctrlin & ACM_CTRL_PARITY ? '+' : '-',
	acm->ctrlin & ACM_CTRL_OVERRUN ? '+' : '-');		acm->ctrlin & ACM_CTRL_OVERRUN ? '+' : '-');

	break;		break;

	default:		default:
	@@ -466,10 +470,11 @@ static void acm_rx_tasklet(unsigned long _acm)
	rcv->urb->transfer_dma = buf->dma;		rcv->urb->transfer_dma = buf->dma;
	rcv->urb->transfer_flags \|= URB_NO_TRANSFER_DMA_MAP;		rcv->urb->transfer_flags \|= URB_NO_TRANSFER_DMA_MAP;

	/* This shouldn't kill the driver as unsuccessful URBs are returned to the		/* This shouldn't kill the driver as unsuccessful URBs are
	free-urbs-pool and resubmited ASAP */		returned to the free-urbs-pool and resubmited ASAP */
	spin_lock_irqsave(&acm->read_lock, flags);		spin_lock_irqsave(&acm->read_lock, flags);
	if (acm->susp_count \|\| usb_submit_urb(rcv->urb, GFP_ATOMIC) < 0) {		if (acm->susp_count \|\|
			usb_submit_urb(rcv->urb, GFP_ATOMIC) < 0) {
	list_add(&buf->list, &acm->spare_read_bufs);		list_add(&buf->list, &acm->spare_read_bufs);
	list_add(&rcv->list, &acm->spare_read_urbs);		list_add(&rcv->list, &acm->spare_read_urbs);
	acm->processing = 0;		acm->processing = 0;
	@@ -588,12 +593,11 @@ static int acm_tty_open(struct tty_struct tty, struct file filp)
	INIT_LIST_HEAD(&acm->spare_read_urbs);		INIT_LIST_HEAD(&acm->spare_read_urbs);
	INIT_LIST_HEAD(&acm->spare_read_bufs);		INIT_LIST_HEAD(&acm->spare_read_bufs);
	INIT_LIST_HEAD(&acm->filled_read_bufs);		INIT_LIST_HEAD(&acm->filled_read_bufs);
	for (i = 0; i < acm->rx_buflimit; i++) {
			for (i = 0; i < acm->rx_buflimit; i++)
	list_add(&(acm->ru[i].list), &acm->spare_read_urbs);		list_add(&(acm->ru[i].list), &acm->spare_read_urbs);
	}		for (i = 0; i < acm->rx_buflimit; i++)
	for (i = 0; i < acm->rx_buflimit; i++) {
	list_add(&(acm->rb[i].list), &acm->spare_read_bufs);		list_add(&(acm->rb[i].list), &acm->spare_read_bufs);
	}

	acm->throttle = 0;		acm->throttle = 0;

	@@ -684,7 +688,8 @@ static void acm_tty_close(struct tty_struct tty, struct file filp)
	mutex_unlock(&open_mutex);		mutex_unlock(&open_mutex);
	}		}

	static int acm_tty_write(struct tty_struct tty, const unsigned char buf, int count)		static int acm_tty_write(struct tty_struct *tty,
			const unsigned char *buf, int count)
	{		{
	struct acm *acm = tty->driver_data;		struct acm *acm = tty->driver_data;
	int stat;		int stat;
	@@ -700,7 +705,8 @@ static int acm_tty_write(struct tty_struct tty, const unsigned char buf, int c
	return 0;		return 0;

	spin_lock_irqsave(&acm->write_lock, flags);		spin_lock_irqsave(&acm->write_lock, flags);
	if ((wbn = acm_wb_alloc(acm)) < 0) {		wbn = acm_wb_alloc(acm);
			if (wbn < 0) {
	spin_unlock_irqrestore(&acm->write_lock, flags);		spin_unlock_irqrestore(&acm->write_lock, flags);
	return 0;		return 0;
	}		}
	@@ -712,7 +718,8 @@ static int acm_tty_write(struct tty_struct tty, const unsigned char buf, int c
	wb->len = count;		wb->len = count;
	spin_unlock_irqrestore(&acm->write_lock, flags);		spin_unlock_irqrestore(&acm->write_lock, flags);

	if ((stat = acm_write_start(acm, wbn)) < 0)		stat = acm_write_start(acm, wbn);
			if (stat < 0)
	return stat;		return stat;
	return count;		return count;
	}		}
	@@ -798,8 +805,10 @@ static int acm_tty_tiocmset(struct tty_struct tty, struct file file,
	return -EINVAL;		return -EINVAL;

	newctrl = acm->ctrlout;		newctrl = acm->ctrlout;
	set = (set & TIOCM_DTR ? ACM_CTRL_DTR : 0) \| (set & TIOCM_RTS ? ACM_CTRL_RTS : 0);		set = (set & TIOCM_DTR ? ACM_CTRL_DTR : 0) \|
	clear = (clear & TIOCM_DTR ? ACM_CTRL_DTR : 0) \| (clear & TIOCM_RTS ? ACM_CTRL_RTS : 0);		(set & TIOCM_RTS ? ACM_CTRL_RTS : 0);
			clear = (clear & TIOCM_DTR ? ACM_CTRL_DTR : 0) \|
			(clear & TIOCM_RTS ? ACM_CTRL_RTS : 0);

	newctrl = (newctrl & ~clear) \| set;		newctrl = (newctrl & ~clear) \| set;

	@@ -808,7 +817,8 @@ static int acm_tty_tiocmset(struct tty_struct tty, struct file file,
	return acm_set_control(acm, acm->ctrlout = newctrl);		return acm_set_control(acm, acm->ctrlout = newctrl);
	}		}

	static int acm_tty_ioctl(struct tty_struct tty, struct file file, unsigned int cmd, unsigned long arg)		static int acm_tty_ioctl(struct tty_struct tty, struct file file,
			unsigned int cmd, unsigned long arg)
	{		{
	struct acm *acm = tty->driver_data;		struct acm *acm = tty->driver_data;

	@@ -830,7 +840,8 @@ static const __u8 acm_tty_size[] = {
	5, 6, 7, 8		5, 6, 7, 8
	};		};

	static void acm_tty_set_termios(struct tty_struct tty, struct ktermios termios_old)		static void acm_tty_set_termios(struct tty_struct *tty,
			struct ktermios *termios_old)
	{		{
	struct acm *acm = tty->driver_data;		struct acm *acm = tty->driver_data;
	struct ktermios *termios = tty->termios;		struct ktermios *termios = tty->termios;
	@@ -840,19 +851,23 @@ static void acm_tty_set_termios(struct tty_struct tty, struct ktermios termios
	if (!ACM_READY(acm))		if (!ACM_READY(acm))
	return;		return;

			/* FIXME: Needs to support the tty_baud interface */
			/* FIXME: Broken on sparc */
	newline.dwDTERate = cpu_to_le32p(acm_tty_speed +		newline.dwDTERate = cpu_to_le32p(acm_tty_speed +
	(termios->c_cflag & CBAUD & ~CBAUDEX) + (termios->c_cflag & CBAUDEX ? 15 : 0));		(termios->c_cflag & CBAUD & ~CBAUDEX) + (termios->c_cflag & CBAUDEX ? 15 : 0));
	newline.bCharFormat = termios->c_cflag & CSTOPB ? 2 : 0;		newline.bCharFormat = termios->c_cflag & CSTOPB ? 2 : 0;
	newline.bParityType = termios->c_cflag & PARENB ?		newline.bParityType = termios->c_cflag & PARENB ?
	(termios->c_cflag & PARODD ? 1 : 2) + (termios->c_cflag & CMSPAR ? 2 : 0) : 0;		(termios->c_cflag & PARODD ? 1 : 2) +
			(termios->c_cflag & CMSPAR ? 2 : 0) : 0;
	newline.bDataBits = acm_tty_size[(termios->c_cflag & CSIZE) >> 4];		newline.bDataBits = acm_tty_size[(termios->c_cflag & CSIZE) >> 4];
			/* FIXME: Needs to clear unsupported bits in the termios */
	acm->clocal = ((termios->c_cflag & CLOCAL) != 0);		acm->clocal = ((termios->c_cflag & CLOCAL) != 0);

	if (!newline.dwDTERate) {		if (!newline.dwDTERate) {
	newline.dwDTERate = acm->line.dwDTERate;		newline.dwDTERate = acm->line.dwDTERate;
	newctrl &= ~ACM_CTRL_DTR;		newctrl &= ~ACM_CTRL_DTR;
	} else newctrl \|= ACM_CTRL_DTR;		} else
			newctrl \|= ACM_CTRL_DTR;

	if (newctrl != acm->ctrlout)		if (newctrl != acm->ctrlout)
	acm_set_control(acm, acm->ctrlout = newctrl);		acm_set_control(acm, acm->ctrlout = newctrl);
	@@ -877,10 +892,9 @@ static void acm_write_buffers_free(struct acm *acm)
	struct acm_wb *wb;		struct acm_wb *wb;
	struct usb_device *usb_dev = interface_to_usbdev(acm->control);		struct usb_device *usb_dev = interface_to_usbdev(acm->control);

	for (wb = &acm->wb[0], i = 0; i < ACM_NW; i++, wb++) {		for (wb = &acm->wb[0], i = 0; i < ACM_NW; i++, wb++)
	usb_buffer_free(usb_dev, acm->writesize, wb->buf, wb->dmah);		usb_buffer_free(usb_dev, acm->writesize, wb->buf, wb->dmah);
	}		}
	}

	static void acm_read_buffers_free(struct acm *acm)		static void acm_read_buffers_free(struct acm *acm)
	{		{
	@@ -888,7 +902,8 @@ static void acm_read_buffers_free(struct acm *acm)
	int i, n = acm->rx_buflimit;		int i, n = acm->rx_buflimit;

	for (i = 0; i < n; i++)		for (i = 0; i < n; i++)
	usb_buffer_free(usb_dev, acm->readsize, acm->rb[i].base, acm->rb[i].dma);		usb_buffer_free(usb_dev, acm->readsize,
			acm->rb[i].base, acm->rb[i].dma);
	}		}

	/* Little helper: write buffers allocate */		/* Little helper: write buffers allocate */
	@@ -956,8 +971,10 @@ static int acm_probe(struct usb_interface *intf,
	}		}

	if (!buflen) {		if (!buflen) {
	if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) {		if (intf->cur_altsetting->endpoint->extralen &&
	dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint\n");		intf->cur_altsetting->endpoint->extra) {
			dev_dbg(&intf->dev,
			"Seeking extra descriptors on endpoint\n");
	buflen = intf->cur_altsetting->endpoint->extralen;		buflen = intf->cur_altsetting->endpoint->extralen;
	buffer = intf->cur_altsetting->endpoint->extra;		buffer = intf->cur_altsetting->endpoint->extra;
	} else {		} else {
	@@ -977,12 +994,10 @@ static int acm_probe(struct usb_interface *intf,
	case USB_CDC_UNION_TYPE: /* we've found it */		case USB_CDC_UNION_TYPE: /* we've found it */
	if (union_header) {		if (union_header) {
	dev_err(&intf->dev, "More than one "		dev_err(&intf->dev, "More than one "
	"union descriptor, "		"union descriptor, skipping ...\n");
	"skipping ...\n");
	goto next_desc;		goto next_desc;
	}		}
	union_header = (struct usb_cdc_union_desc *)		union_header = (struct usb_cdc_union_desc *)buffer;
	buffer;
	break;		break;
	case USB_CDC_COUNTRY_TYPE: /* export through sysfs*/		case USB_CDC_COUNTRY_TYPE: /* export through sysfs*/
	cfd = (struct usb_cdc_country_functional_desc *)buffer;		cfd = (struct usb_cdc_country_functional_desc *)buffer;
	@@ -996,9 +1011,7 @@ static int acm_probe(struct usb_interface *intf,
	call_management_function = buffer[3];		call_management_function = buffer[3];
	call_interface_num = buffer[4];		call_interface_num = buffer[4];
	if ((call_management_function & 3) != 3)		if ((call_management_function & 3) != 3)
	dev_err(&intf->dev, "This device "		dev_err(&intf->dev, "This device cannot do calls on its own. It is not a modem.\n");
	"cannot do calls on its own. "
	"It is no modem.\n");
	break;		break;
	default:		default:
	/* there are LOTS more CDC descriptors that		/* there are LOTS more CDC descriptors that
	@@ -1020,7 +1033,8 @@ static int acm_probe(struct usb_interface *intf,
	data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num));		data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num));
	control_interface = intf;		control_interface = intf;
	} else {		} else {
	dev_dbg(&intf->dev,"No union descriptor, giving up\n");		dev_dbg(&intf->dev,
			"No union descriptor, giving up\n");
	return -ENODEV;		return -ENODEV;
	}		}
	} else {		} else {
	@@ -1038,11 +1052,13 @@ static int acm_probe(struct usb_interface *intf,
	skip_normal_probe:		skip_normal_probe:

	/workaround for switched interfaces /		/workaround for switched interfaces /
	if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) {		if (data_interface->cur_altsetting->desc.bInterfaceClass
	if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) {		!= CDC_DATA_INTERFACE_TYPE) {
			if (control_interface->cur_altsetting->desc.bInterfaceClass
			== CDC_DATA_INTERFACE_TYPE) {
	struct usb_interface *t;		struct usb_interface *t;
	dev_dbg(&intf->dev,"Your device has switched interfaces.\n");		dev_dbg(&intf->dev,
			"Your device has switched interfaces.\n");
	t = control_interface;		t = control_interface;
	control_interface = data_interface;		control_interface = data_interface;
	data_interface = t;		data_interface = t;
	@@ -1073,8 +1089,8 @@ static int acm_probe(struct usb_interface *intf,
	if (!usb_endpoint_dir_in(epread)) {		if (!usb_endpoint_dir_in(epread)) {
	/* descriptors are swapped */		/* descriptors are swapped */
	struct usb_endpoint_descriptor *t;		struct usb_endpoint_descriptor *t;
	dev_dbg(&intf->dev,"The data interface has switched endpoints\n");		dev_dbg(&intf->dev,
			"The data interface has switched endpoints\n");
	t = epread;		t = epread;
	epread = epwrite;		epread = epwrite;
	epwrite = t;		epwrite = t;
	@@ -1087,13 +1103,15 @@ static int acm_probe(struct usb_interface *intf,
	return -ENODEV;		return -ENODEV;
	}		}

	if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) {		acm = kzalloc(sizeof(struct acm), GFP_KERNEL);
			if (acm == NULL) {
	dev_dbg(&intf->dev, "out of memory (acm kzalloc)\n");		dev_dbg(&intf->dev, "out of memory (acm kzalloc)\n");
	goto alloc_fail;		goto alloc_fail;
	}		}

	ctrlsize = le16_to_cpu(epctrl->wMaxPacketSize);		ctrlsize = le16_to_cpu(epctrl->wMaxPacketSize);
	readsize = le16_to_cpu(epread->wMaxPacketSize)* ( quirks == SINGLE_RX_URB ? 1 : 2);		readsize = le16_to_cpu(epread->wMaxPacketSize) *
			(quirks == SINGLE_RX_URB ? 1 : 2);
	acm->writesize = le16_to_cpu(epwrite->wMaxPacketSize) * 20;		acm->writesize = le16_to_cpu(epwrite->wMaxPacketSize) * 20;
	acm->control = control_interface;		acm->control = control_interface;
	acm->data = data_interface;		acm->data = data_interface;
	@@ -1136,8 +1154,10 @@ static int acm_probe(struct usb_interface *intf,
	for (i = 0; i < num_rx_buf; i++) {		for (i = 0; i < num_rx_buf; i++) {
	struct acm_ru *rcv = &(acm->ru[i]);		struct acm_ru *rcv = &(acm->ru[i]);

	if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) {		rcv->urb = usb_alloc_urb(0, GFP_KERNEL);
	dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)\n");		if (rcv->urb == NULL) {
			dev_dbg(&intf->dev,
			"out of memory (read urbs usb_alloc_urb)\n");
	goto alloc_fail7;		goto alloc_fail7;
	}		}

	@@ -1150,20 +1170,23 @@ static int acm_probe(struct usb_interface *intf,
	rb->base = usb_buffer_alloc(acm->dev, readsize,		rb->base = usb_buffer_alloc(acm->dev, readsize,
	GFP_KERNEL, &rb->dma);		GFP_KERNEL, &rb->dma);
	if (!rb->base) {		if (!rb->base) {
	dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n");		dev_dbg(&intf->dev,
			"out of memory (read bufs usb_buffer_alloc)\n");
	goto alloc_fail7;		goto alloc_fail7;
	}		}
	}		}
	for(i = 0; i < ACM_NW; i++)		for (i = 0; i < ACM_NW; i++) {
	{
	struct acm_wb *snd = &(acm->wb[i]);		struct acm_wb *snd = &(acm->wb[i]);

	if (!(snd->urb = usb_alloc_urb(0, GFP_KERNEL))) {		snd->urb = usb_alloc_urb(0, GFP_KERNEL);
	dev_dbg(&intf->dev, "out of memory (write urbs usb_alloc_urb)");		if (snd->urb == NULL) {
			dev_dbg(&intf->dev,
			"out of memory (write urbs usb_alloc_urb)");
	goto alloc_fail7;		goto alloc_fail7;
	}		}

	usb_fill_bulk_urb(snd->urb, usb_dev, usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress),		usb_fill_bulk_urb(snd->urb, usb_dev,
			usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress),
	NULL, acm->writesize, acm_write_bulk, snd);		NULL, acm->writesize, acm_write_bulk, snd);
	snd->urb->transfer_flags \|= URB_NO_TRANSFER_DMA_MAP;		snd->urb->transfer_flags \|= URB_NO_TRANSFER_DMA_MAP;
	snd->instance = acm;		snd->instance = acm;
	@@ -1180,7 +1203,8 @@ static int acm_probe(struct usb_interface *intf,
	if (!acm->country_codes)		if (!acm->country_codes)
	goto skip_countries;		goto skip_countries;
	acm->country_code_size = cfd->bLength - 4;		acm->country_code_size = cfd->bLength - 4;
	memcpy(acm->country_codes, (u8 *)&cfd->wCountyCode0, cfd->bLength - 4);		memcpy(acm->country_codes, (u8 *)&cfd->wCountyCode0,
			cfd->bLength - 4);
	acm->country_rel_date = cfd->iCountryCodeRelDate;		acm->country_rel_date = cfd->iCountryCodeRelDate;

	i = device_create_file(&intf->dev, &dev_attr_wCountryCodes);		i = device_create_file(&intf->dev, &dev_attr_wCountryCodes);
	@@ -1189,7 +1213,8 @@ static int acm_probe(struct usb_interface *intf,
	goto skip_countries;		goto skip_countries;
	}		}

	i = device_create_file(&intf->dev, &dev_attr_iCountryCodeRelDate);		i = device_create_file(&intf->dev,
			&dev_attr_iCountryCodeRelDate);
	if (i < 0) {		if (i < 0) {
	kfree(acm->country_codes);		kfree(acm->country_codes);
	goto skip_countries;		goto skip_countries;
	@@ -1197,8 +1222,10 @@ static int acm_probe(struct usb_interface *intf,
	}		}

	skip_countries:		skip_countries:
	usb_fill_int_urb(acm->ctrlurb, usb_dev, usb_rcvintpipe(usb_dev, epctrl->bEndpointAddress),		usb_fill_int_urb(acm->ctrlurb, usb_dev,
	acm->ctrl_buffer, ctrlsize, acm_ctrl_irq, acm, epctrl->bInterval);		usb_rcvintpipe(usb_dev, epctrl->bEndpointAddress),
			acm->ctrl_buffer, ctrlsize, acm_ctrl_irq, acm,
			epctrl->bInterval);
	acm->ctrlurb->transfer_flags \|= URB_NO_TRANSFER_DMA_MAP;		acm->ctrlurb->transfer_flags \|= URB_NO_TRANSFER_DMA_MAP;
	acm->ctrlurb->transfer_dma = acm->ctrl_dma;		acm->ctrlurb->transfer_dma = acm->ctrl_dma;

	@@ -1281,7 +1308,8 @@ static void acm_disconnect(struct usb_interface *intf)
	stop_data_traffic(acm);		stop_data_traffic(acm);

	acm_write_buffers_free(acm);		acm_write_buffers_free(acm);
	usb_buffer_free(usb_dev, acm->ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);		usb_buffer_free(usb_dev, acm->ctrlsize, acm->ctrl_buffer,
			acm->ctrl_dma);
	acm_read_buffers_free(acm);		acm_read_buffers_free(acm);

	usb_driver_release_interface(&acm_driver, intf == acm->control ?		usb_driver_release_interface(&acm_driver, intf == acm->control ?
	@@ -1497,7 +1525,8 @@ static int __init acm_init(void)
	acm_tty_driver->subtype = SERIAL_TYPE_NORMAL,		acm_tty_driver->subtype = SERIAL_TYPE_NORMAL,
	acm_tty_driver->flags = TTY_DRIVER_REAL_RAW \| TTY_DRIVER_DYNAMIC_DEV;		acm_tty_driver->flags = TTY_DRIVER_REAL_RAW \| TTY_DRIVER_DYNAMIC_DEV;
	acm_tty_driver->init_termios = tty_std_termios;		acm_tty_driver->init_termios = tty_std_termios;
	acm_tty_driver->init_termios.c_cflag = B9600 \| CS8 \| CREAD \| HUPCL \| CLOCAL;		acm_tty_driver->init_termios.c_cflag = B9600 \| CS8 \| CREAD \|
			HUPCL \| CLOCAL;
	tty_set_operations(acm_tty_driver, &acm_ops);		tty_set_operations(acm_tty_driver, &acm_ops);

	retval = tty_register_driver(acm_tty_driver);		retval = tty_register_driver(acm_tty_driver);