diff options
Diffstat (limited to 'zaptel-base.c')
| -rw-r--r-- | zaptel-base.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/zaptel-base.c b/zaptel-base.c index 9f9ad42..86cddbf 100644 --- a/zaptel-base.c +++ b/zaptel-base.c @@ -1136,19 +1136,7 @@ static int set_tone_zone(struct zt_chan *chan, int zone) if ((zone >= ZT_TONE_ZONE_MAX) || (zone < -1)) return -EINVAL; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) - /* 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; -#else - /* But there are no trylock macros for kernel versions before 2.6.11, - * so we do the unsafe thing anyway. Such is the problem for dealing - * with old, buggy kernels. */ read_lock(&zone_lock); -#endif if (zone == -1) { zone = default_zone; @@ -1162,6 +1150,7 @@ static int set_tone_zone(struct zt_chan *chan, int zone) } read_unlock(&zone_lock); + return res; } |