From 74fa9e5dff617e2e1e7688969f3492a6080bb6e1 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Tue, 24 Apr 2012 02:51:49 +0000 Subject: mISDN: Fix NULL pointer bug in if-condition of mISDN_dsp 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 Signed-off-by: David S. Miller --- drivers/isdn/mISDN/dsp_cmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/isdn/mISDN') diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index 334feab060a1..b7589c2eecf5 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; } -- cgit v1.2.2