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

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

keyspan: Use string flip functions when possible 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent deb91685

drivers/usb/serial/keyspan.c

+7 −9
Original line number Original line Diff line number Diff line
@@ -577,7 +577,7 @@ static void usa26_glocont_callback(struct urb *urb) 




static void usa28_indat_callback(struct urb *urb)

static void usa28_indat_callback(struct urb *urb)

{

{

	int                     i, err;

	int                     err;

	struct usb_serial_port  *port;

	struct usb_serial_port  *port;

	struct tty_struct       *tty;

	struct tty_struct       *tty;

	unsigned char           *data;

	unsigned char           *data;
@@ -606,8 +606,7 @@ static void usa28_indat_callback(struct urb *urb) 




		tty = port->port.tty;

		tty = port->port.tty;

		if (urb->actual_length) {

		if (urb->actual_length) {

			for (i = 0; i < urb->actual_length ; ++i)

			tty_insert_flip_string(tty, data, urb->actual_length);

				tty_insert_flip_char(tty, data[i], 0);

			tty_flip_buffer_push(tty);

			tty_flip_buffer_push(tty);

		}

		}
@@ -833,8 +832,8 @@ static void usa49_indat_callback(struct urb *urb) 
		/* 0x80 bit is error flag */

		/* 0x80 bit is error flag */

		if ((data[0] & 0x80) == 0) {

		if ((data[0] & 0x80) == 0) {

			/* no error on any byte */

			/* no error on any byte */

			for (i = 1; i < urb->actual_length ; ++i)

			tty_insert_flip_string(tty, data + 1,

				tty_insert_flip_char(tty, data[i], 0);

						urb->actual_length - 1);

		} else {

		} else {

			/* some bytes had errors, every byte has status */

			/* some bytes had errors, every byte has status */

			for (i = 0; i + 1 < urb->actual_length; i += 2) {

			for (i = 0; i + 1 < urb->actual_length; i += 2) {
@@ -973,10 +972,9 @@ static void usa90_indat_callback(struct urb *urb) 
		/* if current mode is DMA, looks like usa28 format

		/* if current mode is DMA, looks like usa28 format

		   otherwise looks like usa26 data format */

		   otherwise looks like usa26 data format */





		if (p_priv->baud > 57600) {

		if (p_priv->baud > 57600)

			for (i = 0; i < urb->actual_length ; ++i)

			tty_insert_flip_string(tty, data, urb->actual_length);

				tty_insert_flip_char(tty, data[i], 0);

		else {

		} else {

			/* 0x80 bit is error flag */

			/* 0x80 bit is error flag */

			if ((data[0] & 0x80) == 0) {

			if ((data[0] & 0x80) == 0) {

				/* no errors on individual bytes, only

				/* no errors on individual bytes, only