From patchwork Fri Oct 3 15:03:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tilman Schmidt X-Patchwork-Id: 396304 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DB0EA14017D for ; Sat, 4 Oct 2014 02:28:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753592AbaJCQ2T (ORCPT ); Fri, 3 Oct 2014 12:28:19 -0400 Received: from mail.pxnet.com ([89.1.7.7]:41729 "EHLO mail.pxnet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753271AbaJCQ2Q (ORCPT ); Fri, 3 Oct 2014 12:28:16 -0400 X-Greylist: delayed 3374 seconds by postgrey-1.27 at vger.kernel.org; Fri, 03 Oct 2014 12:28:11 EDT Received: from xenon.ts.pxnet.com (p5DE8D4CA.dip0.t-ipconnect.de [93.232.212.202]) (user=ts author=<> mech=DIGEST-MD5 bits=0) by mail.pxnet.com (8.13.8/8.13.8) with ESMTP id s93FVaj0019536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 3 Oct 2014 17:31:40 +0200 Received: by xenon.ts.pxnet.com (Postfix, from userid 1000) id A3AA414007B; Fri, 3 Oct 2014 17:31:34 +0200 (CEST) Message-Id: In-Reply-To: References: From: Tilman Schmidt Date: Fri, 3 Oct 2014 17:03:32 +0200 Subject: [PATCH 1/4] isdn/gigaset: improve error handling when leaving DLE mode To: netdev@vger.kernel.org Cc: David Miller , Hansjoerg Lipp , Karsten Keil , isdn4linux@listserv.isdn4linux.de X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (mail.pxnet.com [89.1.7.7]); Fri, 03 Oct 2014 17:31:44 +0200 (CEST) X-Scanned-By: MIMEDefang 2.70 on 89.1.7.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Avoid cascading warnings when leaving DLE mode fails by clearing the DLE flag before entering recovery. Signed-off-by: Tilman Schmidt --- drivers/isdn/gigaset/ev-layer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c index 7459b12..dcae14a 100644 --- a/drivers/isdn/gigaset/ev-layer.c +++ b/drivers/isdn/gigaset/ev-layer.c @@ -1243,7 +1243,8 @@ static void do_action(int action, struct cardstate *cs, break; case ACT_FAILDLE0: cs->cur_at_seq = SEQ_NONE; - dev_warn(cs->dev, "Could not leave DLE mode.\n"); + dev_warn(cs->dev, "Error leaving DLE mode.\n"); + cs->dle = 0; at_state2 = &cs->bcs[cs->curchannel].at_state; disconnect(&at_state2); schedule_init(cs, MS_RECOVER);