diff --git a/drivers/filesystems/cdfs_new/cdprocs.h b/drivers/filesystems/cdfs_new/cdprocs.h
index 4cb7da20982..921f5237200 100755
--- a/drivers/filesystems/cdfs_new/cdprocs.h
+++ b/drivers/filesystems/cdfs_new/cdprocs.h
@@ -1889,8 +1889,8 @@ CdCommonPnp (                               //  Implemented in Pnp.c
 #define GetExceptionCode() 0
 #define AbnormalTermination() 0
 
-#define try_return(S) { goto try_exit; }
-#define try_leave(S) { leave; }
+#define try_return(S) { S; goto try_exit; }
+#define try_leave(S) { S; leave; }
 
 
 //
diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff
index 46023ebfb93..b785ad91072 100644
--- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff
+++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff
@@ -564,10 +564,8 @@ Index: drivers/filesystems/cdfs_new/cdprocs.h
 +#define GetExceptionCode() 0
 +#define AbnormalTermination() 0
  
--#define try_return(S) { S; goto try_exit; }
--#define try_leave(S) { S; leave; }
-+#define try_return(S) { goto try_exit; }
-+#define try_leave(S) { leave; }
+ #define try_return(S) { S; goto try_exit; }
+ #define try_leave(S) { S; leave; }
  
 +
  //