[zaptel-commits] tzafrir: trunk r1684 - in /trunk/xpp: ./ card_fxo.c

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Thu Nov 30 23:32:00 2006
New Revision: 1684

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1684
Log:
 r1678 at boole:  tzafrir | 2006-12-01 02:13:47 +0200
  r1671 at boole:  tzafrir | 2006-12-01 01:30:24 +0200
   r2806 at boole:  oron | 2006-11-27 16:54:06 +0200
   Fixed panic in ticket:147 merged code from changeset:2802 changeset:2804
   
   
  
 

Modified:
    trunk/xpp/   (props changed)
    trunk/xpp/card_fxo.c

Propchange: trunk/xpp/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Nov 30 23:32:00 2006
@@ -1,5 +1,5 @@
 283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/branches/RELEASE-1.2.0/xpp:2832
-283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2794
-f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.2/xpp:1670
-f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1677
+283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2806
+f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.2/xpp:1671
+f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1678
 f558416c-6c06-0410-9f27-dde2687782d0:/team/tzafrir/xpp_1.2/xpp:1554

Modified: trunk/xpp/card_fxo.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/card_fxo.c?view=diff&rev=1684&r1=1683&r2=1684
==============================================================================
--- trunk/xpp/card_fxo.c (original)
+++ trunk/xpp/card_fxo.c Thu Nov 30 23:32:00 2006
@@ -572,11 +572,7 @@
 					xbus->busname, xpd->xpdname, i);
 				continue;
 			}
-			if(IS_SET(sig_status, i)) {
-				mark_ring(xpd, i, 1);
-			} else {
-				mark_ring(xpd, i, 0);
-			}
+			mark_ring(xpd, i, IS_SET(sig_status, i), 1);
 		}
 	}
 	spin_unlock_irqrestore(&xpd->lock, flags);