From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A899C433DF for ; Thu, 18 Jun 2020 02:39:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 01F9C206E2 for ; Thu, 18 Jun 2020 02:39:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592447950; bh=VYcEbLqVTvXsihFCMZgibdi9np1zRVlEKlCqZtDVEDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MLN5L1vYomkY6jv7opFaNJtycHBODblfV0ugWfGqHUXpudFHRYHsw3sOC4N5YEcnA tSTEl3gibaHv7LmkaS2fzPGxPYDlWI6d8M6TfMjqX3OiBo7g6L9EmhREfdXc+qKdbl 4WUU0UaGO9U5/uKIptZJ2p64te1PsQpsEzyxJbJE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728592AbgFRCjG (ORCPT ); Wed, 17 Jun 2020 22:39:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:42214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729061AbgFRBNL (ORCPT ); Wed, 17 Jun 2020 21:13:11 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A226A21974; Thu, 18 Jun 2020 01:13:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442791; bh=VYcEbLqVTvXsihFCMZgibdi9np1zRVlEKlCqZtDVEDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1OrTzHETyCsYdQ2Rs4OnsBs6I6vTPSzoGs7eE0i5XOmUsqsMpgX4mMlJhgjAcZNHH XymlaR2lPUwbhp94hYESI5yLndtD/eXijd7vnK1yrgW8hpk7QC1rGsStC1ySc0pwCF gNgT67K6aEYMSXYndIwv4naGYk7EnEHVwnke04kE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gregory CLEMENT , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 5.7 234/388] tty: n_gsm: Fix bogus i++ in gsm_data_kick Date: Wed, 17 Jun 2020 21:05:31 -0400 Message-Id: <20200618010805.600873-234-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gregory CLEMENT [ 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 Link: https://lore.kernel.org/r/20200518084517.2173242-3-gregory.clement@bootlin.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/n_gsm.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 0a8f241e537d..f189579db7c4 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -711,17 +711,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); } } } -- 2.25.1