[zaptel-commits] tzafrir: branch 1.2 r1671 - in /branches/1.2/xpp: ./ card_fxo.c

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Thu Nov 30 17:30:24 2006
New Revision: 1671

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1671
Log:
 r2806 at boole:  oron | 2006-11-27 16:54:06 +0200
 Fixed panic in ticket:147 merged code from changeset:2802 changeset:2804
 
 

Modified:
    branches/1.2/xpp/   (props changed)
    branches/1.2/xpp/card_fxo.c

Propchange: branches/1.2/xpp/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Nov 30 17:30:24 2006
@@ -1,4 +1,4 @@
-283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2794
+283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2806
 f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1623
 f558416c-6c06-0410-9f27-dde2687782d0:/team/tzafrir/xpp_1.2/xpp:1554
 f558416c-6c06-0410-9f27-dde2687782d0:/trunk/xpp:1453

Modified: branches/1.2/xpp/card_fxo.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/card_fxo.c?view=diff&rev=1671&r1=1670&r2=1671
==============================================================================
--- branches/1.2/xpp/card_fxo.c (original)
+++ branches/1.2/xpp/card_fxo.c Thu Nov 30 17:30:24 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);