From bac753b8405c719efd4b922c81983fd75e5486fe Mon Sep 17 00:00:00 2001
From: germeier <germeier>
Date: Fri, 23 Apr 2004 18:17:56 +0000
Subject: fixed a stupid bug while closing the device

---
 ChangeLog          | 4 ++++
 libmpio/src/io.c   | 6 +++---
 libmpio/src/mpio.c | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83664d4..f34b9c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-23  Markus Germeier  <mager@tzi.de>
+	* libmpio/src/mpio.c (mpio_close): 
+	  - fixed a stupid bug while closing the device
+
 2004-04-23  Markus Germeier  <mager@tzi.de>
 	* remove all files from CVS which can be automagically
 	  generated by the build environment
diff --git a/libmpio/src/io.c b/libmpio/src/io.c
index 2d0a029..6c1f1eb 100644
--- a/libmpio/src/io.c
+++ b/libmpio/src/io.c
@@ -1,5 +1,5 @@
 /*
- * $Id: io.c,v 1.10 2004/04/19 12:19:26 germeier Exp $
+ * $Id: io.c,v 1.11 2004/04/23 18:17:56 germeier Exp $
  *
  *  libmpio - a library for accessing Digit@lways MPIO players
  *  Copyright (C) 2002-2004 Markus Germeier
@@ -584,19 +584,19 @@ mpio_device_open(mpio_t *m){
     }
   }
 
-  m->use_libusb=0;  
   return MPIO_ERR_PERMISSION_DENIED;
 }
 
 int 
 mpio_device_close(mpio_t *m) {
   if(m->use_libusb) {
+    debugn(2, "closing libusb\n");
     usb_close(m->usb_handle);
-    close(m->fd);
     m->fd=0;
   } 
 #ifdef USE_KMODULE
   else {
+    debugn(2, "closing kernel module\n");
     close(m->fd);
     m->fd=0;
   }
diff --git a/libmpio/src/mpio.c b/libmpio/src/mpio.c
index 6915ff1..1d66578 100644
--- a/libmpio/src/mpio.c
+++ b/libmpio/src/mpio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mpio.c,v 1.12 2004/04/19 12:19:26 germeier Exp $
+ * $Id: mpio.c,v 1.13 2004/04/23 18:17:56 germeier Exp $
  *
  *  libmpio - a library for accessing Digit@lways MPIO players
  *  Copyright (C) 2002-2004 Markus Germeier
@@ -481,7 +481,7 @@ void
 mpio_close(mpio_t *m) 
 {
   if (m) {
-    close(m->fd);
+    mpio_device_close(m);
     
     if(m->internal.fat)
       free(m->internal.fat);
-- 
cgit v1.2.3