From patchwork Tue Dec 8 11:00:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tilman Schmidt X-Patchwork-Id: 553867 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 77CF21402DE for ; Tue, 8 Dec 2015 22:14:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964961AbbLHLOZ (ORCPT ); Tue, 8 Dec 2015 06:14:25 -0500 Received: from gimli.pxnet.com ([89.1.7.7]:59701 "EHLO mail.pxnet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964929AbbLHLOX (ORCPT ); Tue, 8 Dec 2015 06:14:23 -0500 Received: from xenon.ts.pxnet.com (p20030070CF7EEC000219D1FFFE03D8FF.dip0.t-ipconnect.de [IPv6:2003:70:cf7e:ec00:219:d1ff:fe03:d8ff]) (user=ts author=<> mech=DIGEST-MD5 bits=0) by mail.pxnet.com (8.13.8/8.13.8) with ESMTP id tB8B0YUg010018 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 8 Dec 2015 12:00:38 +0100 Received: by xenon.ts.pxnet.com (Postfix, from userid 1000) id 2F6741400A2; Tue, 8 Dec 2015 12:00:33 +0100 (CET) Message-Id: In-Reply-To: References: From: Tilman Schmidt Subject: [PATCH 1/3] ser_gigaset: fix up NULL checks To: Paul Bolle , netdev@vger.kernel.org Cc: Peter Hurley , Sasha Levin , , David Miller , Karsten Keil , isdn4linux@listserv.isdn4linux.de, , Date: Tue, 8 Dec 2015 12:00:33 +0100 (CET) X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (mail.pxnet.com [IPv6:2001:4dd0:f004:7::7]); Tue, 08 Dec 2015 12:00:46 +0100 (CET) X-Scanned-By: MIMEDefang 2.70 on IPv6:2001:4dd0:f004:7::7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit f34d7a5b changed tty->driver to tty->ops but left NULL checks for tty->driver untouched. Fix. Signed-off-by: Tilman Schmidt Fixes: f34d7a5b7010 ("tty: The big operations rework") Acked-by: Paul Bolle Nacked-by: Alan Cox --- drivers/isdn/gigaset/ser-gigaset.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c index 375be50..d8771b5 100644 --- a/drivers/isdn/gigaset/ser-gigaset.c +++ b/drivers/isdn/gigaset/ser-gigaset.c @@ -67,7 +67,7 @@ static int write_modem(struct cardstate *cs) struct sk_buff *skb = bcs->tx_skb; int sent = -EOPNOTSUPP; - if (!tty || !tty->driver || !skb) + if (!tty || !tty->ops || !skb) return -EINVAL; if (!skb->len) { @@ -109,7 +109,7 @@ static int send_cb(struct cardstate *cs) unsigned long flags; int sent = 0; - if (!tty || !tty->driver) + if (!tty || !tty->ops) return -EFAULT; cb = cs->cmdbuf; @@ -432,7 +432,7 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state, struct tty_struct *tty = cs->hw.ser->tty; unsigned int set, clear; - if (!tty || !tty->driver || !tty->ops->tiocmset) + if (!tty || !tty->ops || !tty->ops->tiocmset) return -EINVAL; set = new_state & ~old_state; clear = old_state & ~new_state;