commit 084f6708312265b501561a9c6d6e9cb38943985c
author Jaikumar Ganesh <jaikumar@google.com> Tue Aug 18 16:40:29 2009 -0700
committer Jaikumar Ganesh <jaikumar@google.com> Tue Aug 18 16:44:40 2009 -0700
tree 8529d026af4bbf856f2dc3ef463b370c8e2bbb84
parent ee1fadc192a63724e416b05666844a62d1e75d38

Release mutex locks on error conditions.

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index 31d5eb9..f6f09cd 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -1171,9 +1171,6 @@
         return -1;
     }
 
-
-    // FIXME is blocking here ok? issue #550970
-
     pthread_mutex_lock(&s_writeMutex);
 
     header = htonl(dataSize);
@@ -1181,12 +1178,14 @@
     ret = blockingWrite(fd, (void *)&header, sizeof(header));
 
     if (ret < 0) {
+        pthread_mutex_unlock(&s_writeMutex);
         return ret;
     }
 
     ret = blockingWrite(fd, data, dataSize);
 
     if (ret < 0) {
+        pthread_mutex_unlock(&s_writeMutex);
         return ret;
     }