netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Karsten Keil <kkeil@linux-pingi.de>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Andreas Eversberg <jolly@eversberg.eu>
Subject: [PATCH 1/4] mISDN: Fix NULL pointer bug in if-condition of mISDN_dsp
Date: Tue, 24 Apr 2012 14:51:49 +0200	[thread overview]
Message-ID: <1335271912-5269-2-git-send-email-kkeil@linux-pingi.de> (raw)
In-Reply-To: <1335271912-5269-1-git-send-email-kkeil@linux-pingi.de>

From: Andreas Eversberg <jolly@eversberg.eu>

Fix a bug (was introduced by a cut & paste error)
in cases when dsp->conf was NULL.

Signed-off-by: Andreas Eversberg <jolly@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
---
 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;
 	}
 
-- 
1.7.3.4

  reply	other threads:[~2012-04-24 12:54 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-24 12:51 [PATCH 0/4] mISDN: Bugfixes for the mISDN DSP core Karsten Keil
2012-04-24 12:51 ` Karsten Keil [this message]
2012-04-24 12:51 ` [PATCH 2/4] mISDN: Fixed hardware bridging/conference check routine of mISDN_dsp.ko Karsten Keil
2012-04-24 12:51 ` [PATCH 3/4] mISDN: Fix division by zero Karsten Keil
2012-04-24 12:51 ` [PATCH 4/4] mISDN: DSP scheduling fix Karsten Keil
2012-04-26  0:38   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1335271912-5269-2-git-send-email-kkeil@linux-pingi.de \
    --to=kkeil@linux-pingi.de \
    --cc=davem@davemloft.net \
    --cc=jolly@eversberg.eu \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).