From 03addd3ea631e9f401e14eda5db151b0a055c41e Mon Sep 17 00:00:00 2001
From: neil <neil@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Tue, 17 Jul 2012 04:00:08 +0000
Subject: [PATCH] Call CloseDevice() before DeleteIORequest(), and don't call
 CloseDevice() with a NULL argument.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@45243 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 workbench/devs/AHI/Drivers/CMI8738/misc.c       | 17 +++++++----------
 workbench/devs/AHI/Drivers/CMI8738/version.date |  2 +-
 workbench/devs/AHI/Drivers/CMI8738/version.h    |  4 ++--
 workbench/devs/AHI/Drivers/CMI8738/version.rev  |  2 +-
 workbench/devs/AHI/Drivers/SB128/misc.c         | 23 ++++++++++-------------
 workbench/devs/AHI/Drivers/SB128/version.date   |  2 +-
 workbench/devs/AHI/Drivers/SB128/version.h      |  4 ++--
 workbench/devs/AHI/Drivers/SB128/version.rev    |  2 +-
 8 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/workbench/devs/AHI/Drivers/CMI8738/misc.c b/workbench/devs/AHI/Drivers/CMI8738/misc.c
index 6972625d9b..384228ddac 100755
--- a/workbench/devs/AHI/Drivers/CMI8738/misc.c
+++ b/workbench/devs/AHI/Drivers/CMI8738/misc.c
@@ -81,16 +81,13 @@ void micro_delay(unsigned int val)
         TimerBase = (struct Device *) TimerIO->tr_node.io_Device;
     }
     
-    if (TimerIO)
-    {
-        TimerIO->tr_node.io_Command = TR_ADDREQUEST; /* Add a request.   */
-        TimerIO->tr_time.tv_secs = 0;                /* 0 seconds.      */
-        TimerIO->tr_time.tv_micro = val;             /* 'val' micro seconds. */
-        DoIO((struct IORequest *) TimerIO);
-        DeleteIORequest((struct IORequest *) TimerIO);
-        TimerIO = NULL;
-        CloseDevice((struct IORequest *) TimerIO);
-    }
+    TimerIO->tr_node.io_Command = TR_ADDREQUEST; /* Add a request.   */
+    TimerIO->tr_time.tv_secs = 0;                /* 0 seconds.      */
+    TimerIO->tr_time.tv_micro = val;             /* 'val' micro seconds. */
+    DoIO((struct IORequest *) TimerIO);
+    CloseDevice((struct IORequest *) TimerIO);
+    DeleteIORequest((struct IORequest *) TimerIO);
+    TimerIO = NULL;
     
     if (replymp)
     {
diff --git a/workbench/devs/AHI/Drivers/CMI8738/version.date b/workbench/devs/AHI/Drivers/CMI8738/version.date
index f03e6d6389..340bbda567 100644
--- a/workbench/devs/AHI/Drivers/CMI8738/version.date
+++ b/workbench/devs/AHI/Drivers/CMI8738/version.date
@@ -1 +1 @@
-20.7.11
+17.7.2012
diff --git a/workbench/devs/AHI/Drivers/CMI8738/version.h b/workbench/devs/AHI/Drivers/CMI8738/version.h
index c6630fa26a..8378ce66e3 100755
--- a/workbench/devs/AHI/Drivers/CMI8738/version.h
+++ b/workbench/devs/AHI/Drivers/CMI8738/version.h
@@ -1,3 +1,3 @@
 #define VERSION 5
-#define REVISION 18
-#define VERS "5.18 (20.7.11)"
+#define REVISION 19
+#define VERS "5.19 (17.7.2012)"
diff --git a/workbench/devs/AHI/Drivers/CMI8738/version.rev b/workbench/devs/AHI/Drivers/CMI8738/version.rev
index 3c032078a4..d6b24041cf 100644
--- a/workbench/devs/AHI/Drivers/CMI8738/version.rev
+++ b/workbench/devs/AHI/Drivers/CMI8738/version.rev
@@ -1 +1 @@
-18
+19
diff --git a/workbench/devs/AHI/Drivers/SB128/misc.c b/workbench/devs/AHI/Drivers/SB128/misc.c
index 82c01c29bf..87500ee2a5 100755
--- a/workbench/devs/AHI/Drivers/SB128/misc.c
+++ b/workbench/devs/AHI/Drivers/SB128/misc.c
@@ -81,21 +81,18 @@ void micro_delay(unsigned int val)
     TimerBase = (struct Device *)TimerIO->tr_node.io_Device;
   }
   
-  if (TimerIO)
+  TimerIO->tr_node.io_Command = TR_ADDREQUEST;
+  TimerIO->tr_time.tv_secs = 0;
+  TimerIO->tr_time.tv_micro = val;
+  DoIO((struct IORequest *)TimerIO);
+  CloseDevice((struct IORequest *)TimerIO);
+  DeleteIORequest((struct IORequest *)TimerIO);
+  TimerIO = NULL;
+
+  if (replymp)
   {
-    TimerIO->tr_node.io_Command = TR_ADDREQUEST;
-    TimerIO->tr_time.tv_secs = 0;
-    TimerIO->tr_time.tv_micro = val;
-    DoIO((struct IORequest *)TimerIO);
-    DeleteIORequest((struct IORequest *)TimerIO);
-    TimerIO = NULL;
-    CloseDevice((struct IORequest *)TimerIO);
+    DeleteMsgPort(replymp);
   }
-
-    if (replymp)
-    {
-        DeleteMsgPort(replymp);
-    }
 }
 
 unsigned long src_ready(struct SB128_DATA *card)
diff --git a/workbench/devs/AHI/Drivers/SB128/version.date b/workbench/devs/AHI/Drivers/SB128/version.date
index 22a8ec2b0a..340bbda567 100755
--- a/workbench/devs/AHI/Drivers/SB128/version.date
+++ b/workbench/devs/AHI/Drivers/SB128/version.date
@@ -1 +1 @@
-28.08.11
+17.7.2012
diff --git a/workbench/devs/AHI/Drivers/SB128/version.h b/workbench/devs/AHI/Drivers/SB128/version.h
index 7592891d03..0bf5cb4b86 100755
--- a/workbench/devs/AHI/Drivers/SB128/version.h
+++ b/workbench/devs/AHI/Drivers/SB128/version.h
@@ -1,3 +1,3 @@
 #define VERSION 5
-#define REVISION 25
-#define VERS "5.25 (28.08.11)"
+#define REVISION 26
+#define VERS "5.26 (17.7.2012)"
diff --git a/workbench/devs/AHI/Drivers/SB128/version.rev b/workbench/devs/AHI/Drivers/SB128/version.rev
index 7273c0fa8c..6f4247a625 100755
--- a/workbench/devs/AHI/Drivers/SB128/version.rev
+++ b/workbench/devs/AHI/Drivers/SB128/version.rev
@@ -1 +1 @@
-25
+26
-- 
2.11.4.GIT