Merged revisions 1306 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1306 | kpfleming | 2006-08-14 15:40:55 -0500 (Mon, 14 Aug 2006) | 2 lines

revert this change until a version that compiles on 2.4 kernels and older 2.6 kernels is made available and tested

........


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1307 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 3 insertions, 9 deletions

diff --git a/zaptel.c b/zaptel.c
index 5a5172d..c9e5b76 100644
--- a/zaptel.c
+++ b/zaptel.c
@@ -1135,14 +1135,8 @@ static int set_tone_zone(struct zt_chan *chan, int zone)
 	/* 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;
 	}
@@ -1153,7 +1147,7 @@ static int set_tone_zone(struct zt_chan *chan, int zone)
 	} else {
 		res = -ENODATA;
 	}
-
+	
 	read_unlock(&zone_lock);
 	return res;
 }