[svn-commits] kpfleming: branch 1.2 r1306 - /branches/1.2/zaptel.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Aug 14 15:40:55 2006
New Revision: 1306

URL: http://svn.digium.com/view/zaptel?rev=1306&view=rev
Log:
revert this change until a version that compiles on 2.4 kernels and older 2.6 kernels is made available and tested

Modified:
    branches/1.2/zaptel.c

Modified: branches/1.2/zaptel.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/zaptel.c?rev=1306&r1=1305&r2=1306&view=diff
==============================================================================
--- branches/1.2/zaptel.c (original)
+++ branches/1.2/zaptel.c Mon Aug 14 15:40:55 2006
@@ -1091,14 +1091,8 @@
 	/* Assumes channel is already locked */
 	if ((zone >= ZT_TONE_ZONE_MAX) || (zone < -1))
 		return -EINVAL;
-
-	/* Since this routine is called both from IRQ as well as from userspace,
-	 * it is possible that we could be called during an IRQ while userspace
-	 * has locked this.  However unlikely, this could possibly cause a
-	 * deadlock. */
-	if (! read_trylock(&zone_lock))
-		return -EWOULDBLOCK;
-
+	
+	read_lock(&zone_lock);
 	if (zone == -1) {
 		zone = default_zone;
 	}
@@ -1109,7 +1103,7 @@
 	} else {
 		res = -ENODATA;
 	}
-
+	
 	read_unlock(&zone_lock);
 	return res;
 }