[zaptel-commits] tzafrir: trunk r1286 - in /trunk/xpp: card_fxs.c xpp_zap.c

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Wed Aug  9 22:16:36 2006
New Revision: 1286

URL: http://svn.digium.com/view/zaptel?rev=1286&view=rev
Log:
Bugfix: should not call zaptel for unregistered XPD's.

Modified:
    trunk/xpp/card_fxs.c
    trunk/xpp/xpp_zap.c

Modified: trunk/xpp/card_fxs.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/card_fxs.c?rev=1286&r1=1285&r2=1286&view=diff
==============================================================================
--- trunk/xpp/card_fxs.c (original)
+++ trunk/xpp/card_fxs.c Wed Aug  9 22:16:36 2006
@@ -811,6 +811,8 @@
 	spin_lock_irqsave(&xpd->lock, flags);
 	priv = xpd->priv;
 	BUG_ON(!priv);
+	if(!SPAN_REGISTERED(xpd))
+		goto out;
 #if 0
 	DBG("SLIC_REPLY: xpd #%d %s reg_num=0x%X, dataL=0x%X dataH=0x%X\n",
 			xpd->id, (info->indirect)?"I":"D",
@@ -845,6 +847,7 @@
 		}
 	}
 
+out:
 	/* Update /proc info only if reply relate to the last slic read request */
 	if(priv->requested_reply.indirect == info->indirect &&
 			priv->requested_reply.reg_num == info->reg_num) {

Modified: trunk/xpp/xpp_zap.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/xpp_zap.c?rev=1286&r1=1285&r2=1286&view=diff
==============================================================================
--- trunk/xpp/xpp_zap.c (original)
+++ trunk/xpp/xpp_zap.c Wed Aug  9 22:16:36 2006
@@ -626,6 +626,8 @@
 {
 	struct zt_chan	*chan;
 
+	if(!SPAN_REGISTERED(xpd))
+		return;
 	BUG_ON(!xpd);
 	chan = &xpd->chans[pos];
 	if(good)