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

Commit c993257b authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

serial: core: Unwrap tertiary assignment in uart_handle_dcd_change() 



Prepare for spin lock assertion; move non-trivial assignment into
function body.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5435d20f

drivers/tty/serial/serial_core.c

+8 −5
Original line number Diff line number Diff line
@@ -2748,13 +2748,16 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status) 
{

	struct tty_port *port = &uport->state->port;

	struct tty_struct *tty = port->tty;

	struct tty_ldisc *ld = tty ? tty_ldisc_ref(tty) : NULL;

	struct tty_ldisc *ld;



	if (tty) {

		ld = tty_ldisc_ref(tty);

		if (ld) {

			if (ld->ops->dcd_change)

				ld->ops->dcd_change(tty, status);

			tty_ldisc_deref(ld);

		}

	}



	uport->icount.dcd++;