Merge tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / net / irda / ircomm / ircomm_tty_attach.c

diff --git a/net/irda/ircomm/ircomm_tty_attach.c b/net/irda/ircomm/ircomm_tty_attach.c
index 61137f8b5293617c789172cf5c1840417cb7efa6..0a411019c09864206beedde16bf87532cae651b6 100644 (file)
--- a/net/irda/ircomm/ircomm_tty_attach.c
+++ b/net/irda/ircomm/ircomm_tty_attach.c
@@ -968,7 +968,7 @@ static int ircomm_tty_state_ready(struct ircomm_tty_cb *self,
                ircomm_tty_next_state(self, IRCOMM_TTY_SEARCH);
                ircomm_tty_start_watchdog_timer(self, 3*HZ);
 
-               if (self->port.flags & ASYNC_CHECK_CD) {
+               if (tty_port_check_carrier(&self->port)) {
                        /* Drop carrier */
                        self->settings.dce = IRCOMM_DELTA_CD;
                        ircomm_tty_check_modem_status(self);