Commit 6041be6142075d4ae6875ab8350f136a43937f0a
2013-05-28T17:07:49
Reuse old MTX Handle
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/usbutils.c b/usbutils.c
index a109c4e..02faa0b 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -2626,8 +2626,8 @@ static bool resource_lock(const char *dname, uint8_t bus_number, uint8_t device_
return true;
fail:
- sec = unsec(sec);
CloseHandle(usbMutex);
+ sec = unsec(sec);
return false;
#else
struct semid_ds seminfo;
@@ -2730,14 +2730,6 @@ static void resource_unlock(const char *dname, uint8_t bus_number, uint8_t devic
if (!usbMutex || !sec)
goto fila;
- usbMutex = CreateMutex(sec, FALSE, name);
- if (usbMutex == NULL) {
- applog(LOG_ERR,
- "MTX: %s USB failed to get '%s' for release err (%d)",
- dname, name, GetLastError());
- goto fila;
- }
-
if (!ReleaseMutex(usbMutex))
applog(LOG_ERR,
"MTX: %s USB failed to release '%s' err (%d)",
@@ -2745,10 +2737,10 @@ static void resource_unlock(const char *dname, uint8_t bus_number, uint8_t devic
fila:
- if (sec)
- unsec(sec);
if (usbMutex)
CloseHandle(usbMutex);
+ if (sec)
+ unsec(sec);
remove_in_use(bus_number, device_address);
return;
#else