Merge commit 'origin/master' into next

[pandora-kernel.git] / drivers / isdn / mISDN / dsp_dtmf.c

diff --git a/drivers/isdn/mISDN/dsp_dtmf.c b/drivers/isdn/mISDN/dsp_dtmf.c
index efc371c..9ae2d33 100644 (file)
--- a/drivers/isdn/mISDN/dsp_dtmf.c
+++ b/drivers/isdn/mISDN/dsp_dtmf.c
@@ -51,6 +51,9 @@ void dsp_dtmf_hardware(struct dsp *dsp)
 {
        int hardware = 1;
 
+       if (!dsp->dtmf.enable)
+               return;
+
        if (!dsp->features.hfc_dtmf)
                hardware = 0;