--- a/apicompatanamdw/bcdrivers/mw/drm/oma_drm_caf_agent_api/DRM_CAF/src/DRM_CAFBlocks.cpp	Mon Sep 20 10:04:46 2010 +0100
+++ b/apicompatanamdw/bcdrivers/mw/drm/oma_drm_caf_agent_api/DRM_CAF/src/DRM_CAFBlocks.cpp	Tue Sep 21 11:28:45 2010 +0100
@@ -1803,10 +1803,15 @@
     TInt r;
     content = CContent::NewLC(KOma2Content);
     STIF_ASSERT_NOT_NULL(content);
-    content->CancelNotifyStatusChange(status);
-    User::WaitForRequest(status);
-    //r = status;
-    //STIF_ASSERT_EQUALS( KErrCANotSupported,r);
+    TInt r = content->CancelNotifyStatusChange(status);
+    
+    if (r != KErrCANotSupported)
+    {
+        User::WaitForRequest(status);
+        r = status;
+        }
+        
+    STIF_ASSERT_EQUALS( KErrCANotSupported,r);
     CleanupStack::PopAndDestroy();
     return KErrNone;
     }