summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorzvecr <git@zvecr.com>2019-03-15 16:55:07 +0100
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-03-15 16:55:07 +0100
commite0a03bfa6c148da2936b27a2285f1928c5574ac0 (patch)
tree07da06d5bd1dee48f1a66e03d77b67a4e12a27aa /drivers
parentb85e2eef9a44dac2e8d1119199238fd6c225586a (diff)
downloadqmk_firmware-e0a03bfa6c148da2936b27a2285f1928c5574ac0.tar.gz
qmk_firmware-e0a03bfa6c148da2936b27a2285f1928c5574ac0.tar.xz
Fix return value of i2c_readReg and i2c_receive (#5410)
Diffstat (limited to 'drivers')
-rwxr-xr-xdrivers/avr/i2c_master.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/avr/i2c_master.c b/drivers/avr/i2c_master.c
index d97a35cd6..0db949db4 100755
--- a/drivers/avr/i2c_master.c
+++ b/drivers/avr/i2c_master.c
@@ -140,7 +140,7 @@ i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16
i2c_stop();
- return status;
+ return (status < 0) ? status : I2C_STATUS_SUCCESS;
}
i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
@@ -188,7 +188,7 @@ i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16
error:
i2c_stop();
- return status;
+ return (status < 0) ? status : I2C_STATUS_SUCCESS;
}
void i2c_stop(void) {