[svn-commits] sruffell: linux/trunk r10070 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Jul 21 11:26:31 2011
New Revision: 10070

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10070
Log:
dahdi: Drivers that do not support hwec should not report hwec is available.

When attaching software echocans to a channel, if there is a hardware
echocan available always give preference to them.

Revision 9995 "dahdi: Always attach hwec to a channel if available" had
an error where if a driver did not even support an option of hardware
echocan, dahdi-base would take that to mean there always was a hardware
echocan available on the channel.

DAHLIN-246

Reported-by: Michael L. Young
Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=10070&r1=10069&r2=10070
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Thu Jul 21 11:26:31 2011
@@ -4842,8 +4842,10 @@
  */
 static bool dahdi_is_hwec_available(const struct dahdi_chan *chan)
 {
-	if (!hwec_factory.get_name(chan))
+	if (!chan->span || !chan->span->ops->echocan_name ||
+	    !hwec_factory.get_name(chan))
 		return false;
+
 	return true;
 }