From 9069a1ad6e4a7ba160f8070cc22d8db90b68a0e4 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 17 Jul 2012 03:03:29 +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@45240 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/devs/AHI/Drivers/HDAudio/misc.c | 17 +++++++---------- workbench/devs/AHI/Drivers/HDAudio/version.date | 2 +- workbench/devs/AHI/Drivers/HDAudio/version.rev | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/workbench/devs/AHI/Drivers/HDAudio/misc.c b/workbench/devs/AHI/Drivers/HDAudio/misc.c index c8c6d221ad..71cf11edd5 100644 --- a/workbench/devs/AHI/Drivers/HDAudio/misc.c +++ b/workbench/devs/AHI/Drivers/HDAudio/misc.c @@ -82,16 +82,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/HDAudio/version.date b/workbench/devs/AHI/Drivers/HDAudio/version.date index f6185fbaf5..340bbda567 100644 --- a/workbench/devs/AHI/Drivers/HDAudio/version.date +++ b/workbench/devs/AHI/Drivers/HDAudio/version.date @@ -1 +1 @@ -4.7.2012 +17.7.2012 diff --git a/workbench/devs/AHI/Drivers/HDAudio/version.rev b/workbench/devs/AHI/Drivers/HDAudio/version.rev index 3c032078a4..d6b24041cf 100644 --- a/workbench/devs/AHI/Drivers/HDAudio/version.rev +++ b/workbench/devs/AHI/Drivers/HDAudio/version.rev @@ -1 +1 @@ -18 +19 -- 2.11.4.GIT