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

Commit dee7d0f3 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

serdev: ttyport: enforce tty-driver open() requirement 



The tty-driver open routine is mandatory, but the serdev
tty-port-controller implementation did not treat it as such and would
instead fall back to calling tty_port_open() directly.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2a71de2f

drivers/tty/serdev/serdev-ttyport.c

+10 −4
Original line number Diff line number Diff line
@@ -102,10 +102,10 @@ static int ttyport_open(struct serdev_controller *ctrl) 
		return PTR_ERR(tty);

	serport->tty = tty;



	if (tty->ops->open)

	if (!tty->ops->open)

		goto err_unlock;



	tty->ops->open(serport->tty, NULL);

	else

		tty_port_open(serport->port, tty, NULL);



	/* Bring the UART into a known 8 bits no parity hw fc state */

	ktermios = tty->termios;
@@ -122,6 +122,12 @@ static int ttyport_open(struct serdev_controller *ctrl) 


	tty_unlock(serport->tty);

	return 0;



err_unlock:

	tty_unlock(tty);

	tty_release_struct(tty, serport->tty_idx);



	return -ENODEV;

}



static void ttyport_close(struct serdev_controller *ctrl)