X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Focl.c;h=0b492c64ab9f06dfb5124031e55ccb339066d112;hp=26d28305824ca0a8f55ae2b07df3110bb2f9768e;hb=afe0298399bd06700926822e6d49c5bc44151956;hpb=6435e75e147a6559ed4f784b5e89c8390e787a2a

diff --git a/src/flash/ocl.c b/src/flash/ocl.c
index 26d2830582..0b492c64ab 100644
--- a/src/flash/ocl.c
+++ b/src/flash/ocl.c
@@ -46,8 +46,6 @@ static int ocl_protect_check(struct flash_bank *bank)
 /* flash_bank ocl 0 0 0 0 <target#> */
 FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command)
 {
-	int retval;
-	struct arm *armv4_5;
 	struct arm7_9_common *arm7_9;
 	struct ocl_priv *ocl;
 
@@ -57,8 +55,9 @@ FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command)
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	if ((retval = arm7_9_get_arch_pointers(bank->target, &armv4_5, &arm7_9)) != ERROR_OK)
-		return retval;
+	arm7_9 = target_to_arm7_9(bank->target);
+	if (!is_arm7_9(arm7_9))
+		return ERROR_TARGET_INVALID;
 
 	ocl = bank->driver_priv = malloc(sizeof(struct ocl_priv));
 	ocl->jtag_info = &arm7_9->jtag_info;