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

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

io_edgeport: Fix various bogus returns to the tty layer 



The edgeport reports negative error codes to functions that do not
expect them. This can cause ports to jam forever

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

drivers/usb/serial/io_edgeport.c

+6 −6
Original line number Diff line number Diff line
@@ -1404,15 +1404,15 @@ static int edge_write_room(struct tty_struct *tty) 
	dbg("%s", __func__);



	if (edge_port == NULL)

		return -ENODEV;

		return 0;

	if (edge_port->closePending)

		return -ENODEV;

		return 0;



	dbg("%s - port %d", __func__, port->number);



	if (!edge_port->open) {

		dbg("%s - port not opened", __func__);

		return -EINVAL;

		return 0;

	}



	/* total of both buffers is still txCredit */
@@ -1444,13 +1444,13 @@ static int edge_chars_in_buffer(struct tty_struct *tty) 
	dbg("%s", __func__);



	if (edge_port == NULL)

		return -ENODEV;

		return 0;

	if (edge_port->closePending)

		return -ENODEV;

		return 0;



	if (!edge_port->open) {

		dbg("%s - port not opened", __func__);

		return -EINVAL;

		return 0;

	}



	spin_lock_irqsave(&edge_port->ep_lock, flags);