diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c
index e5e1438af..f12355c60 100644
--- a/src/jtag/bitbang.c
+++ b/src/jtag/bitbang.c
@@ -75,7 +75,7 @@ void bitbang_path_move(pathmove_command_t *cmd)
 {
 	int num_states = cmd->num_states;
 	int state_count;
-	int tms;
+	int tms = 0;
 
 	state_count = 0;
 	while (num_states)
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 1b3a17b0a..75cda35a1 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -178,6 +178,7 @@ int arm926ejs_cp15_read(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u3
 	fields[0].in_handler_priv = value;
 	fields[0].in_handler = arm_jtag_buf_to_u32;
 	
+	/*TODO: add timeout*/
 	do
 	{
 		/* rescan with NOP, to wait for the access to complete */
@@ -256,7 +257,7 @@ int arm926ejs_cp15_write(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u
 	fields[3].in_handler_priv = NULL;
 	
 	jtag_add_dr_scan(4, fields, -1);
-
+	/*TODO: add timeout*/
 	do
 	{
 		/* rescan with NOP, to wait for the access to complete */