diff options
author | 2023-08-20 14:29:37 +0200 | |
---|---|---|
committer | 2023-08-20 14:29:37 +0200 | |
commit | 642073c306e66daca108cb630d169129e50a6ba3 (patch) | |
tree | fe2edb842a30b67d369e5934602560aa3719b02e /drivers/tty/n_gsm.c | |
parent | tty: gdm724x: simplify gdm_tty_write() (diff) | |
parent | Merge tag 'tty-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
download | linux-642073c306e66daca108cb630d169129e50a6ba3.tar.gz linux-642073c306e66daca108cb630d169129e50a6ba3.tar.bz2 linux-642073c306e66daca108cb630d169129e50a6ba3.zip |
Merge commit b320441c04c9 ("Merge tag 'tty-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty") into tty-next
We need the serial-core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/n_gsm.c')
-rw-r--r-- | drivers/tty/n_gsm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 42759500b79e..31033663f964 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -3042,12 +3042,13 @@ static void gsm_error(struct gsm_mux *gsm) static void gsm_cleanup_mux(struct gsm_mux *gsm, bool disc) { int i; - struct gsm_dlci *dlci = gsm->dlci[0]; + struct gsm_dlci *dlci; struct gsm_msg *txq, *ntxq; gsm->dead = true; mutex_lock(&gsm->mutex); + dlci = gsm->dlci[0]; if (dlci) { if (disc && dlci->state != DLCI_CLOSED) { gsm_dlci_begin_close(dlci); |