--- a/khronosfws/openmax_al/src/radio/xaradioitf.c	Wed Aug 18 10:17:22 2010 +0300
+++ b/khronosfws/openmax_al/src/radio/xaradioitf.c	Thu Sep 02 20:58:01 2010 +0300
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -159,11 +159,8 @@
                                                XAuint32 * pFreqInterval)
 {
     XAresult ret = XA_RESULT_SUCCESS;
-    XAboolean isSupported = XA_BOOLEAN_FALSE;
     XARadioItfImpl* impl = GetImpl(self);
 
-   *pFreqInterval = FREQINTERVAL;   
-		    
     DEBUG_API("->XARadioItfImpl_GetFreqRangeProperties");
 
     if(!impl || !pMinFreq || !pMaxFreq || !pFreqInterval)
@@ -173,9 +170,13 @@
         DEBUG_API("<-XARadioItfImpl_GetFreqRangeProperties");
         return XA_RESULT_PARAMETER_INVALID;
     }
-		
+
     ret = XARadioItfAdapt_GetFreqRangeProperties( (XAAdaptationMMFCtx*)impl->adapCtx,
             range, pMinFreq, pMaxFreq );
+    if (ret == XA_RESULT_SUCCESS)
+    {
+        *pFreqInterval = FREQINTERVAL;
+    }
 
     DEBUG_API("<-XARadioItfImpl_GetFreqRangeProperties");
     return ret;
@@ -196,7 +197,7 @@
     XAuint32 minFreq;
     XAuint32 maxFreq;
    	XAuint32 freqInterval;
-        
+
     XARadioItfImpl* impl = GetImpl(self);
     DEBUG_API("->XARadioItfImpl_SetFrequency");
     XA_IMPL_THREAD_SAFETY_ENTRY(XATSRadio);
@@ -208,23 +209,23 @@
         DEBUG_API("<-XARadioItfImpl_SetFrequency");
         return XA_RESULT_PARAMETER_INVALID;
     }
-    
-    // Check for valid entries: 
- 		ret = XARadioItfImpl_GetFreqRangeProperties(self, range, &minFreq, &maxFreq, &freqInterval);   
+
+    // Check for valid entries:
+ 		ret = XARadioItfImpl_GetFreqRangeProperties(self, range, &minFreq, &maxFreq, &freqInterval);
     if (ret != XA_RESULT_SUCCESS)
     {
     	XA_IMPL_THREAD_SAFETY_EXIT(XATSRadio);
-    	DEBUG_API("<-XARadioItfImpl_SetFrequency");    	
+    	DEBUG_API("<-XARadioItfImpl_SetFrequency");
     	return ret;
-    }		
-    
+    }
+
     if ( (freq < minFreq) || (freq > maxFreq) )
     {
     	XA_IMPL_THREAD_SAFETY_EXIT(XATSRadio);
-    	DEBUG_API("<-XARadioItfImpl_SetFrequency");    	
+    	DEBUG_API("<-XARadioItfImpl_SetFrequency");
     	return XA_RESULT_PARAMETER_INVALID;
-    }	  
-           
+    }
+
    	ret = XARadioItfAdapt_SetFrequency( (XAAdaptationMMFCtx*)impl->adapCtx, freq );
 
     XA_IMPL_THREAD_SAFETY_EXIT(XATSRadio);
@@ -372,7 +373,7 @@
         {
          	  impl->stereoMode = mode;
         }
-    }    
+    }
     XA_IMPL_THREAD_SAFETY_EXIT(XATSRadio);
     DEBUG_API("<-XARadioItfImpl_SetStereoMode");
     return ret;
@@ -541,7 +542,7 @@
                                   XAchar * pName,
                                   XAuint16 * pNameLength)
 {
- 
+
     XAresult ret = XA_RESULT_FEATURE_UNSUPPORTED;
 
     DEBUG_API("<-XARadioItfImpl_GetPreset");
@@ -657,7 +658,7 @@
     XARadioItfImpl* impl =(XARadioItfImpl*)pHandlerCtx;
     XAuint32 eventData = 0;
     XAboolean eventBoolean = XA_BOOLEAN_FALSE;
-    
+
     DEBUG_API("->XARadioItfimpl_AdaptCb");
 
     if(!impl)
@@ -670,37 +671,37 @@
 
     if( event->eventid == XA_ADAPT_RADIO_FREQUENCY_CHANGED && impl->callback )
     {
-        DEBUG_API("Frequency changed in adaptation"); 
+        DEBUG_API("Frequency changed in adaptation");
         eventData = *(XAuint32*)event->data;
         impl->callback( impl->cbPtrToSelf, impl->context, XA_RADIO_EVENT_FREQUENCY_CHANGED, eventData, eventBoolean );
     }
-    
+
     else if( event->eventid == XA_ADAPT_RADIO_FREQUENCY_RANGE_CHANGED && impl->callback )
     {
         DEBUG_API("Frequency range changed in adaptation");
 
         impl->callback( impl->cbPtrToSelf, impl->context, XA_RADIO_EVENT_FREQUENCY_RANGE_CHANGED, eventData, eventBoolean  );
     }
-    
+
     else if( event->eventid == XA_ADAPT_RADIO_SEEK_COMPLETE && impl->callback )
     {
         DEBUG_API("Seek complete in adaptation");
-       	eventBoolean = *(XAboolean*)event->data;        
-        impl->callback( impl->cbPtrToSelf, impl->context, XA_RADIO_EVENT_SEEK_COMPLETED, eventData, eventBoolean  );     
+       	eventBoolean = *(XAboolean*)event->data;
+        impl->callback( impl->cbPtrToSelf, impl->context, XA_RADIO_EVENT_SEEK_COMPLETED, eventData, eventBoolean  );
     }
-    
+
     else if( event->eventid == XA_ADAPT_RADIO_STEREO_STATUS_CHANGED && impl->callback )
     {
         DEBUG_API("Stereo status change in adaptation");
-      	eventBoolean = *(XAboolean*)event->data;          
+      	eventBoolean = *(XAboolean*)event->data;
         impl->callback( impl->cbPtrToSelf, impl->context, XA_RADIO_EVENT_STEREO_STATUS_CHANGED, eventData, eventBoolean  );
-    } 
-        
+    }
+
     else if( event->eventid == XA_ADAPT_RADIO_SIGNAL_STRENGTH_CHANGED && impl->callback )
     {
         DEBUG_API("Signal Strength Change in adaptation");
         impl->callback( impl->cbPtrToSelf, impl->context, XA_RADIO_EVENT_SIGNAL_STRENGTH_CHANGED, eventData, eventBoolean  );
-    }      
+    }
     else
     {
         /* do nothing */