--- a/khronosfws/openmax_al/src/common/xanokialinearvolumeitf.c	Thu Aug 12 20:27:32 2010 -0500
+++ b/khronosfws/openmax_al/src/common/xanokialinearvolumeitf.c	Tue Aug 24 03:16:41 2010 -0500
@@ -294,15 +294,13 @@
 
     DEBUG_API("->XANokiaLinearVolumeItfimpl_AdaptCb");
 
-    if (!impl && !event)
+    if (!impl || !event)
         {
         DEBUG_ERR("XANokiaLinearVolumeItfImpl_AdaptCb, invalid context pointer!");
         DEBUG_API("<-XANokiaLinearVolumeItfImpl_AdaptCb");
         return;
         }
     
-    assert(event);
-
     if (event->eventid == XA_ADAPT_VOLUME_VOLUME_CHANGED && impl->callback)
         {
         if (XA_NOKIALINEARVOLUME_EVENT_VOLUME_CHANGED & impl->eventFlags)
@@ -312,9 +310,5 @@
                     XA_NOKIALINEARVOLUME_EVENT_VOLUME_CHANGED, eventBoolean);
             }
         }
-    else
-        {
-        /* do nothing */
-        }
     DEBUG_API("<-XANokiaLinearVolumeItfimpl_AdaptCb");
     }