X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fhla%2Fhla_interface.c;fp=src%2Fjtag%2Fhla%2Fhla_interface.c;h=00e454917a3830b2881b2fd635632379a9892aba;hp=0176a4823820229be5bf75d1c1945094f4c43176;hb=ff94e02b7cfe5df892824e60140dcdd07ed2b01c;hpb=24099b4c144f1c6d1244b8b4d98c0fd69c9ff2fc

diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index 0176a48238..00e454917a 100644
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -84,7 +84,8 @@ int hl_interface_init_target(struct target *t)
 		uint32_t expected = t->tap->expected_ids[ii];
 
 		/* treat "-expected-id 0" as a "don't-warn" wildcard */
-		if (!expected || (t->tap->idcode == expected)) {
+		if (!expected || !t->tap->idcode ||
+		    (t->tap->idcode == expected)) {
 			found = 1;
 			break;
 		}