From patchwork Tue Apr 24 12:51:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 154672 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 4EB71B6F62 for ; Tue, 24 Apr 2012 22:54:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754216Ab2DXMyt (ORCPT ); Tue, 24 Apr 2012 08:54:49 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:55195 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754012Ab2DXMyk (ORCPT ); Tue, 24 Apr 2012 08:54:40 -0400 Received: from mailone.linux-pingi.de (p5497CC26.dip.t-dialin.net [84.151.204.38]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LlLpD-1RlxOt2tJX-00alRW; Tue, 24 Apr 2012 14:54:37 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTP id 6908E5275; Tue, 24 Apr 2012 14:54:34 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 1000) id CFF629FB86; Tue, 24 Apr 2012 14:51:52 +0200 (CEST) From: Karsten Keil To: David Miller Cc: netdev@vger.kernel.org, Andreas Eversberg Subject: [PATCH 1/4] mISDN: Fix NULL pointer bug in if-condition of mISDN_dsp Date: Tue, 24 Apr 2012 14:51:49 +0200 Message-Id: <1335271912-5269-2-git-send-email-kkeil@linux-pingi.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1335271912-5269-1-git-send-email-kkeil@linux-pingi.de> References: <1335271912-5269-1-git-send-email-kkeil@linux-pingi.de> X-Provags-ID: V02:K0:QgEsp90BvmTOkgbuaAPgGEYQCMeCNTqB7rXyXFLfjMS Ktj1FFbWgkRBMEFsRJF4pbB4iKnh0mfD+o7BvV49s9E6/fPhKC 6l8xcqgU609u+04HPkJ9fNSfw2IMsa3vLMbzqaN4JR2HrGHEF/ a4TZJxj9F+FT+njKclak6l4PEjJICursErikqDlFqC8CrR67Km gyL7GBjonuxLHo6/YADgcJocax6x478WLbqTNejQVV+/Xj8qBC sb2nuH31MZIuNdAj8CtMMUUrhfCD7D7gsI1XK4h7VUY/GNS/1E Gbr9Kt+q2Afa7SnR6ePOQww21Y1+P/g4ua5bsmIjfN0yIR2RdG 58xC+oZMYlijBArNDm9m7RbmLkYokTiVwmSoThnlSe/IgaVrL0 053057E7vp4NB7ux8VElDbI0gH0Fc2PgN0= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andreas Eversberg Fix a bug (was introduced by a cut & paste error) in cases when dsp->conf was NULL. Signed-off-by: Andreas Eversberg Signed-off-by: Karsten Keil --- drivers/isdn/mISDN/dsp_cmx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index 334feab..b7589c2 100644 --- a/drivers/isdn/mISDN/dsp_cmx.c +++ b/drivers/isdn/mISDN/dsp_cmx.c @@ -1328,7 +1328,7 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members) } if (dsp->conf && dsp->conf->software && dsp->conf->hardware) tx_data_only = 1; - if (dsp->conf->software && dsp->echo.hardware) + if (dsp->echo.software && dsp->echo.hardware) tx_data_only = 1; }