Patchwork [1/4] mISDN: Fix NULL pointer bug in if-condition of mISDN_dsp

login
register
mail settings
Submitter Karsten Keil
Date April 24, 2012, 12:51 p.m.
Message ID <1335271912-5269-2-git-send-email-kkeil@linux-pingi.de>
Download mbox | patch
Permalink /patch/154672/
State Accepted
Delegated to: David Miller
Headers show

Comments

Karsten Keil - April 24, 2012, 12:51 p.m.
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(-)

Patch

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;
 	}