diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c index b5fc202c3a8..899f56a8105 100644 --- a/arch/arm/src/sama5/sam_twi.c +++ b/arch/arm/src/sama5/sam_twi.c @@ -1027,6 +1027,9 @@ static int twi_registercallback(FAR struct i2c_dev_s *dev, * Receive a block of data on I2C using the previously selected I2C * frequency and slave address. * + * Returned Value: + * Returns zero on success; a negated errno value on failure. + * *******************************************************************************/ #ifdef CONFIG_I2C_TRANSFER diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c index 46a3ab9a1f5..fd35ca0711c 100644 --- a/drivers/input/mxt.c +++ b/drivers/input/mxt.c @@ -291,20 +291,8 @@ static int mxt_getreg(FAR struct mxt_dev_s *priv, uint16_t regaddr, */ ret = I2C_TRANSFER(priv->i2c, msg, 2); - if (ret == 2) + if (ret < 0) { - ret = OK; - } - - /* The return value was an error or some number of messages other than 2 */ - - else - { - if (ret >= 0) - { - ret = -EIO; - } - idbg("ERROR: I2C_TRANSFER failed: %d\n", ret); } @@ -344,20 +332,8 @@ static int mxt_putreg(FAR struct mxt_dev_s *priv, uint16_t regaddr, */ ret = I2C_TRANSFER(priv->i2c, msg, 2); - if (ret == 2) + if (ret < 0) { - ret = OK; - } - - /* The return value was an error or some number of messages other than 2 */ - - else - { - if (ret >= 0) - { - ret = -EIO; - } - idbg("ERROR: I2C_TRANSFER failed: %d\n", ret); } @@ -387,7 +363,7 @@ static FAR struct mxt_object_s *mxt_object(FAR struct mxt_dev_s *priv, } } - idbg("ERROR: Invalid object type\n"); + idbg("ERROR: Invalid object type: %d\n", type); return NULL; }