--- a/khronosfws/openmax_al/src/common/xanokialinearvolumeitf.c	Fri Sep 03 19:34:12 2010 -0500
+++ b/khronosfws/openmax_al/src/common/xanokialinearvolumeitf.c	Tue Sep 21 11:38:43 2010 -0500
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 
 #include "xanlinearvolumeitf.h"
 #include "xanokialinearvolumeitfadaptationmmf.h"
@@ -277,7 +276,6 @@
 void XANokiaLinearVolumeItfImpl_Free(XANokiaLinearVolumeItfImpl* self)
     {
     DEBUG_API("->XANokiaLinearVolumeItfImpl_Free");
-    assert(self==self->self);
     free(self);
     DEBUG_API("<-XANokiaLinearVolumeItfImpl_Free");
     }
@@ -310,5 +308,9 @@
                     XA_NOKIALINEARVOLUME_EVENT_VOLUME_CHANGED, eventBoolean);
             }
         }
+    else
+        {
+        /* do nothing */
+        }
     DEBUG_API("<-XANokiaLinearVolumeItfimpl_AdaptCb");
     }