diff options
| author | Gregory CLEMENT <gregory.clement@bootlin.com> | 2020-05-18 10:45:13 +0200 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2020-06-30 15:38:26 -0400 |
| commit | 707818ed1f56303c1cdffb9c3e9a320d4b793a0b (patch) | |
| tree | 4211a590d7a380d71ebd4862cdbd473c129b3fe4 | |
| parent | 1d2deee6189aa3a18c4f9980e7ddc4796b739e87 (diff) | |
| download | linux-stable-707818ed1f56303c1cdffb9c3e9a320d4b793a0b.tar.gz linux-stable-707818ed1f56303c1cdffb9c3e9a320d4b793a0b.tar.bz2 linux-stable-707818ed1f56303c1cdffb9c3e9a320d4b793a0b.zip | |
tty: n_gsm: Fix bogus i++ in gsm_data_kick
[ Upstream commit 4dd31f1ffec6c370c3c2e0c605628bf5e16d5c46 ]
When submitting the previous fix "tty: n_gsm: Fix waking up upper tty
layer when room available". It was suggested to switch from a while to
a for loop, but when doing it, there was a remaining bogus i++.
This patch removes this i++ and also reorganizes the code making it more
compact.
Fixes: e1eaea46bb40 ("tty: n_gsm line discipline")
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Link: https://lore.kernel.org/r/20200518084517.2173242-3-gregory.clement@bootlin.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/tty/n_gsm.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 56716f525030..1ab9bd433542 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -719,17 +719,9 @@ static void gsm_data_kick(struct gsm_mux *gsm, struct gsm_dlci *dlci) } else { int i = 0; - for (i = 0; i < NUM_DLCI; i++) { - struct gsm_dlci *dlci; - - dlci = gsm->dlci[i]; - if (dlci == NULL) { - i++; - continue; - } - - tty_port_tty_wakeup(&dlci->port); - } + for (i = 0; i < NUM_DLCI; i++) + if (gsm->dlci[i]) + tty_port_tty_wakeup(&gsm->dlci[i]->port); } } } |