From ad567fa537bf796394732b5632e1e352733e82d5 Mon Sep 17 00:00:00 2001 From: Jake Dahl Date: Tue, 9 Oct 2018 10:20:57 -0600 Subject: [PATCH] I should really compile before pushing, fixed a scoping error on int result --- src/lib/drivers/smbus/SMBus.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/drivers/smbus/SMBus.cpp b/src/lib/drivers/smbus/SMBus.cpp index 43bee5d577..a0b038cc3b 100644 --- a/src/lib/drivers/smbus/SMBus.cpp +++ b/src/lib/drivers/smbus/SMBus.cpp @@ -117,18 +117,22 @@ int SMBus::block_write(const uint8_t cmd_code, void *data, uint8_t byte_count, b } unsigned i = 0; + int result = 0; // If block_write fails, try up to 10 times. while (i < 10) { - int result = transfer((uint8_t *)buf, byte_count + 2, nullptr, 0); + result = transfer((uint8_t *)buf, byte_count + 2, nullptr, 0); if (result != PX4_OK) { i++; if (i == 10) { PX4_WARN("Block_write failed 10 times"); - result = -ENODATA; + result = -EINVAL; } + + } else { + break; } }