tty_ldisc_flush(tty);
 
        tty->closing = 0;
-       port->tty = NULL;
+       tty_port_tty_set(port, NULL);
 
        if (port->blocked_open) {
                if (port->close_delay)
                uart_shutdown(state);
                port->count = 0;
                clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
-               port->tty = NULL;
+               tty_port_tty_set(port, NULL);
                wake_up_interruptible(&port->open_wait);
                wake_up_interruptible(&port->delta_msr_wait);
        }
        state->uart_port->state = state;
        tty->low_latency = (state->uart_port->flags & UPF_LOW_LATENCY) ? 1 : 0;
        tty->alt_speed = 0;
-       port->tty = tty;
+       tty_port_tty_set(port, tty);
 
        /*
         * If the port is in the middle of closing, bail out now.