From 71212942da25d062c0070e4802b0ca90ff171681 Mon Sep 17 00:00:00 2001 From: Ralf Ramsauer Date: Tue, 30 Aug 2016 12:35:13 +0200 Subject: [PATCH] AP_HAL: AP_HAL_Linux: align I2CDevice::read_registers_multiple() 25c7e8b changed the logic of transfer(). Align I2CDevice::read_registers_multiple() in the same way. Signed-off-by: Ralf Ramsauer --- libraries/AP_HAL_Linux/I2CDevice.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_HAL_Linux/I2CDevice.cpp b/libraries/AP_HAL_Linux/I2CDevice.cpp index 2cb17c22fa..899a3c5346 100644 --- a/libraries/AP_HAL_Linux/I2CDevice.cpp +++ b/libraries/AP_HAL_Linux/I2CDevice.cpp @@ -217,13 +217,13 @@ bool I2CDevice::read_registers_multiple(uint8_t first_reg, uint8_t *recv, recv += recv_len; }; - int r = -EINVAL; + int r; unsigned retries = _retries; do { r = ::ioctl(_bus.fd, I2C_RDWR, &i2c_data); - } while (r < 0 && retries-- > 0); + } while (r == -1 && retries-- > 0); - if (r < 0) { + if (r == -1) { return false; }