OSDN Git Service

mISDN: Fix NULL pointer bug in if-condition of mISDN_dsp
authorAndreas Eversberg <jolly@eversberg.eu>
Tue, 24 Apr 2012 02:51:49 +0000 (02:51 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Apr 2012 07:10:45 +0000 (03:10 -0400)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/isdn/mISDN/dsp_cmx.c

index 334feab..b7589c2 100644 (file)
@@ -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;
        }