From: Giovanni Maruzzelli <gmaruzz@gmail.com>
Date: Sun, 19 Dec 2010 19:40:27 +0000 (-0600)
Subject: skypopen: refined hrtimers support to OSS audio driver
X-Git-Tag: v1.2-rc1~223^2~9^2~7^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=299c139c3ec6c9b276cefce4d6f1568d0d7100dc;p=thirdparty%2Ffreeswitch.git

skypopen: refined hrtimers support to OSS audio driver
---

diff --git a/src/mod/endpoints/mod_skypopen/oss/main.c b/src/mod/endpoints/mod_skypopen/oss/main.c
index 2abc5b342a..a96e38d68a 100644
--- a/src/mod/endpoints/mod_skypopen/oss/main.c
+++ b/src/mod/endpoints/mod_skypopen/oss/main.c
@@ -250,6 +250,10 @@ static ssize_t skypopen_read(struct file *filp, char __user *buf, size_t count,
 {
 	DEFINE_WAIT(wait);
 	struct skypopen_dev *dev = filp->private_data;
+
+	if(unload)
+		return -1;
+
 #ifdef WANT_HRTIMER
 #if 1
 	if(dev->timer_inq_started == 0){
@@ -278,6 +282,10 @@ static ssize_t skypopen_write(struct file *filp, const char __user *buf, size_t
 {
 	DEFINE_WAIT(wait);
 	struct skypopen_dev *dev = filp->private_data;
+
+	if(unload)
+		return -1;
+
 #ifdef WANT_HRTIMER
 #if 1
 	if(dev->timer_outq_started == 0){
@@ -372,10 +380,14 @@ void skypopen_cleanup_module(void)
 		ret= del_timer( &lptr->device.timer_outq );
 		printk( "Stopped skypopen OSS driver write timer\n");
 #else// WANT_HRTIMER
-		ret = hrtimer_cancel( &lptr->device.timer_inq );
-		printk( "Stopped skypopen OSS driver read HRtimer\n");
-		ret = hrtimer_cancel( &lptr->device.timer_outq );
-		printk( "Stopped skypopen OSS driver write HRtimer\n");
+		if(lptr->device.timer_inq_started){
+			ret = hrtimer_cancel( &lptr->device.timer_inq );
+			printk( "Stopped skypopen OSS driver read HRtimer\n");
+		}
+		if(lptr->device.timer_outq_started){
+			ret = hrtimer_cancel( &lptr->device.timer_outq );
+			printk( "Stopped skypopen OSS driver write HRtimer\n");
+		}
 
 #endif// WANT_HRTIMER
 		list_del(&lptr->list);