USB: safe_serial: straighten out read processing (6d1bf48e) · Commits · 戴 / test

drivers/usb/serial/safe_serial.c

+21 −22

Original line number	Original line	Diff line number	Diff line
	@@ -218,7 +218,9 @@ static void safe_process_read_urb(struct urb *urb)
	struct usb_serial_port *port = urb->context;		struct usb_serial_port *port = urb->context;
	unsigned char *data = urb->transfer_buffer;		unsigned char *data = urb->transfer_buffer;
	unsigned char length = urb->actual_length;		unsigned char length = urb->actual_length;
			int actual_length;
	struct tty_struct *tty;		struct tty_struct *tty;
			__u16 fcs;

	if (!length)		if (!length)
	return;		return;
	@@ -227,30 +229,27 @@ static void safe_process_read_urb(struct urb *urb)
	if (!tty)		if (!tty)
	return;		return;

	if (safe) {		if (!safe)
	__u16 fcs;		goto out;

	fcs = fcs_compute10(data, length, CRC10_INITFCS);		fcs = fcs_compute10(data, length, CRC10_INITFCS);
	if (!fcs) {		if (fcs) {
	int actual_length = data[length - 2] >> 2;
	if (actual_length <= (length - 2)) {
	dev_info(&urb->dev->dev, "%s - actual: %d\n",
	__func__, actual_length);
	tty_insert_flip_string(tty,
	data, actual_length);
	tty_flip_buffer_push(tty);
	} else {
	dev_err(&port->dev,
	"%s - inconsistent lengths %d:%d\n",
	__func__, actual_length, length);
	}
	} else {
	dev_err(&port->dev, "%s - bad CRC %x\n", __func__, fcs);		dev_err(&port->dev, "%s - bad CRC %x\n", __func__, fcs);
			goto err;
	}		}
	} else {
			actual_length = data[length - 2] >> 2;
			if (actual_length > (length - 2)) {
			dev_err(&port->dev, "%s - inconsistent lengths %d:%d\n",
			__func__, actual_length, length);
			goto err;
			}
			dev_info(&urb->dev->dev, "%s - actual: %d\n", __func__, actual_length);
			length = actual_length;
			out:
	tty_insert_flip_string(tty, data, length);		tty_insert_flip_string(tty, data, length);
	tty_flip_buffer_push(tty);		tty_flip_buffer_push(tty);
	}		err:

	tty_kref_put(tty);		tty_kref_put(tty);
	}		}

Admin message