Skip to content

Commit f1fc7ad

Browse files
kcxtandersson
authored andcommitted
firehose: ensure we properly set skip_storage_init in provision
This got broken during some refactoring, pass the correct values through. Fixes: 841a0a8 ("firehose: Improve startup time significantly") Signed-off-by: Casey Connolly <casey.connolly@linaro.org>
1 parent 7fd466c commit f1fc7ad

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

firehose.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ static int firehose_reset(struct qdl_device *qdl)
956956
}
957957

958958
static int firehose_detect_and_configure(struct qdl_device *qdl,
959-
bool skip_storage_init __unused,
959+
bool skip_storage_init,
960960
enum qdl_storage_type storage,
961961
unsigned int timeout_s)
962962
{
@@ -967,7 +967,7 @@ static int firehose_detect_and_configure(struct qdl_device *qdl,
967967
gettimeofday(&now, NULL);
968968
timeradd(&now, &timeout, &timeout);
969969
for (;;) {
970-
ret = firehose_try_configure(qdl, false, storage);
970+
ret = firehose_try_configure(qdl, skip_storage_init, storage);
971971

972972
if (ret == FIREHOSE_ACK) {
973973
break;
@@ -1016,7 +1016,7 @@ int firehose_run(struct qdl_device *qdl)
10161016

10171017
ux_info("waiting for programmer...\n");
10181018

1019-
ret = firehose_detect_and_configure(qdl, true, qdl->storage_type, 5);
1019+
ret = firehose_detect_and_configure(qdl, false, qdl->storage_type, 5);
10201020
if (ret)
10211021
return ret;
10221022

0 commit comments

Comments
 (0)