OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

maXTouch: Fix test of I2C_TRANSFER return value

This commit is contained in:
Gregory Nutt 2014-07-06 08:51:38 -06:00
parent b4d3cebc2f
commit 4afc23d16d
2 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/src/sama5/sam_twi.c
View File

@ -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

30
drivers/input/mxt.c
View File

@ -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;
}