diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 35cf12147e39..08134fdde351 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2507,9 +2507,6 @@ static int gsmld_open(struct tty_struct *tty)
 	if (gsm == NULL)
 		return -ENOMEM;
 
-	tty->disc_data = gsm;
-	tty->receive_room = 65536;
-
 	/* Attach the initial passive connection */
 	gsm->encoding = 1;
 
@@ -2518,6 +2515,10 @@ static int gsmld_open(struct tty_struct *tty)
 		gsm_cleanup_mux(gsm);
 		mux_put(gsm);
 	}
+
+	tty->disc_data = gsm;
+	tty->receive_room = 65536;
+
 	return ret;
 }