Resolved SDOCM00102876

diff --git a/docs/ReleaseNotes_RM.doc b/docs/ReleaseNotes_RM.doc
index 93da2a0967c9cf418a008d5d779588b88250447f..872e9a6716ad355dcca5d17ccf679d9b2cb89d13 100644 (file)
Binary files a/docs/ReleaseNotes_RM.doc and b/docs/ReleaseNotes_RM.doc differ

diff --git a/docs/ReleaseNotes_RM.pdf b/docs/ReleaseNotes_RM.pdf
index 9075f96cfe27a0a1a1b2521bec0522919b7f9ee3..c7b46acccbb4369f6e9a4ee09d4a530c5c39ae75 100644 (file)
Binary files a/docs/ReleaseNotes_RM.pdf and b/docs/ReleaseNotes_RM.pdf differ

diff --git a/package.xdc b/package.xdc
index c764e8edfc5a308d28db488e824644dc72f24f5f..5ab0df169fcda2ab5ddf96d1feb52bc858ee35c4 100755 (executable)
--- a/package.xdc
+++ b/package.xdc
@@ -9,6 +9,6 @@
  * Copyright (C) 2012-2013, Texas Instruments, Inc.\r
  *****************************************************************************/\r
 \r
-package ti.drv.rm[02, 00, 00, 05] {\r
+package ti.drv.rm[02, 00, 00, 06] {\r
     module Settings;\r
 }\r

diff --git a/src/rm.c b/src/rm.c
index 09e8a8a890711db04c4590f76f85f996cbb7d068..8e0b191b8f8155015234631622f42dcf2eac546f 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -816,7 +816,7 @@ errorExit:
  */
 static void clientProcess (Rm_Inst *rmInst, Rm_Transaction *transaction)
 {
-    Rm_Transaction    *transQ = rmInst->transactionQueue;
+    Rm_Transaction *transQ;
     
     if (!rmInst->registeredWithDelegateOrServer) {
         staticAllocationHandler((Rm_Handle)rmInst, transaction);
@@ -832,6 +832,7 @@ static void clientProcess (Rm_Inst *rmInst, Rm_Transaction *transaction)
         }
 
         /* Forward any queued static requests that weren't forwarded */
+        transQ = rmInst->transactionQueue;
         while(transQ) {
             if ((transQ->state == RM_SERVICE_APPROVED_STATIC) &&
                 (!transQ->hasBeenForwarded)) {
@@ -859,7 +860,7 @@ static void cdProcess (Rm_Inst *rmInst, Rm_Transaction *transaction)
 {      
     Rm_Transaction *newTrans = NULL;
     Rm_Allocator   *allocator = NULL;
-    Rm_Transaction *transQ = rmInst->transactionQueue;
+    Rm_Transaction *transQ;
 
     if (!rmInst->registeredWithDelegateOrServer) {
         if ((transaction->state == RM_SERVICE_PROCESSING) &&
@@ -1014,6 +1015,7 @@ static void cdProcess (Rm_Inst *rmInst, Rm_Transaction *transaction)
         /* Attempt allocation of any queued static requests:
          * RM_SERVICE_APPROVED_STATIC - Originated locally
          * RM_SERVICE_PROCESSING - Received from any registered Clients */
+        transQ = rmInst->transactionQueue;
         while(transQ) {
             if (((transQ->state == RM_SERVICE_PROCESSING) ||
                  (transQ->state == RM_SERVICE_APPROVED_STATIC)) &&