diff -r 0ffee699d6c7 -r 878846f7623e usbengines/usbotgwatcher/src/cusbindicatornotifier.cpp
--- a/usbengines/usbotgwatcher/src/cusbindicatornotifier.cpp	Fri Apr 23 23:57:55 2010 +0300
+++ b/usbengines/usbotgwatcher/src/cusbindicatornotifier.cpp	Sat Apr 24 00:13:51 2010 +0300
@@ -182,7 +182,7 @@
         default:
             {
             LOG1("Unknown timer id = %d", aTimerId)
-            Panic(EWrongTimerId);
+            PANIC(EWrongTimerId);
             }
         }
     }
@@ -244,9 +244,9 @@
 //  
 void CUsbIndicatorNotifier::SetIndicatorL()
     {
-    if (!(iOtgWatcher.IsDeviceA()))
+    if (!(iOtgWatcher.IsDeviceA()) || iOtgWatcher.CurrentHostState()->Id() == EUsbStateHostAPeripheral)
         {
-        // if B, than other party (usbwatcher) takes care of usb indicator
+        // if B or peripheral, than other party (usbwatcher) takes care of usb indicator
         // in combined usbwatcher (if role swap allowed) one class has to manage usb indicator 
         return;
         }