[xiph-commits] r12330 - trunk/oss2pulse/src/oss2pulse

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2007-01-17 00:37:29 -0800 (Wed, 17 Jan 2007)
New Revision: 12330

Modified:
   trunk/oss2pulse/src/oss2pulse/dsp.c
Log:
clean up pending blocked calls during a close.



Modified: trunk/oss2pulse/src/oss2pulse/dsp.c
===================================================================
--- trunk/oss2pulse/src/oss2pulse/dsp.c	2007-01-16 18:19:35 UTC (rev 12329)
+++ trunk/oss2pulse/src/oss2pulse/dsp.c	2007-01-17 08:37:29 UTC (rev 12330)
@@ -841,7 +841,10 @@
 }
 
 static int dsp_polldiff(struct fusd_file_info* file, unsigned int cached_state){
-  debug (DEBUG_LEVEL_DEBUG2, "PollDiff to device...\n");
+  
+  debug(DEBUG_LEVEL_NORMAL, __FILE__": poll_diff()\n");
+
+
   return -EINVAL;
 }
 
@@ -849,7 +852,19 @@
   fd_info *i = file->private_data;
   
   debug(DEBUG_LEVEL_NORMAL, __FILE__": close()\n");
-  
+
+  if(i->read_file){
+    fusd_return(i->read_file, 0);
+    i->read_file = NULL;
+    i->read_buffer = NULL;
+  }
+
+  if(i->write_file){
+    fusd_return(i->write_file, 0);
+    i->write_file = NULL;
+    i->write_buffer = NULL;
+  }
+
   fd_info_remove_from_list(i);
   
   return 0;