diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index be4a11f9b7..3fd79864cf 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -23,10 +23,9 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 		return CMD_RET_USAGE;
 
 	usb_controller = argv[1];
+	controller_index = simple_strtoul(usb_controller, NULL, 0);
 #ifdef CONFIG_FASTBOOT_USB_DEV
 	controller_index = CONFIG_FASTBOOT_USB_DEV;
-#else
-	controller_index = simple_strtoul(usb_controller, NULL, 0);
 #endif
 
 	ret = board_usb_init(controller_index, USB_INIT_DEVICE);