diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2012-04-24 02:51:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-26 03:10:45 -0400 |
| commit | 74fa9e5dff617e2e1e7688969f3492a6080bb6e1 (patch) | |
| tree | e8bd6bcc9cff4718e4a1113189404935074c7a3c /drivers/isdn/mISDN | |
| parent | 8dcf01fc009d12d01fd195ed95eaaee61178f21a (diff) | |
| download | blackbird-op-linux-74fa9e5dff617e2e1e7688969f3492a6080bb6e1.tar.gz blackbird-op-linux-74fa9e5dff617e2e1e7688969f3492a6080bb6e1.zip | |
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 <jolly@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/mISDN')
| -rw-r--r-- | 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 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; } |
