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: Check for successful memory allocation was backward

This commit is contained in:
Gregory Nutt 2014-07-07 09:55:39 -06:00
parent 95bbdb675b
commit 5bbc0a0dd9
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/mxt.c
View File

@ -1498,7 +1498,7 @@ static int mxt_hwinitialize(FAR struct mxt_dev_s *priv)
/* Allocate memory for the object table */
priv->objtab = kzalloc(info->nobjects * sizeof(struct mxt_object_s));
if (priv->objtab != NULL)
if (priv->objtab == NULL)
{
idbg("ERROR: Failed to allocate object table\n");
return -ENOMEM;
@ -1568,7 +1568,7 @@ static int mxt_hwinitialize(FAR struct mxt_dev_s *priv)
priv->sample = (FAR struct mxt_sample_s *)
kzalloc(nslots * sizeof(struct mxt_sample_s));
if (!priv->sample)
if (priv->sample == NULL)
{
idbg("ERROR: Failed to allocate object table\n");
goto errout_with_objtab;
@ -1632,7 +1632,7 @@ int mxt_register(FAR struct i2c_dev_s *i2c,
/* Create and initialize a maXTouch device driver instance */
priv = (FAR struct mxt_dev_s *)kzalloc(sizeof(struct mxt_dev_s));
if (!priv)
if (priv == NULL)
{
idbg("ERROR: Failed allocate device structure\n");
return -ENOMEM;

9
include/nuttx/i2c.h
View File

@ -83,11 +83,12 @@
/* Bit definitions for the flags field in struct i2c_msg_s */
#define I2C_M_READ 0x0001 /* read data, from slave to master */
#define I2C_M_TEN 0x0002 /* ten bit address */
#define I2C_M_NORESTART 0x0080 /* message should not begin with (re-)start of transfer */
#define I2C_M_READ 0x0001 /* Read data, from slave to master */
#define I2C_M_TEN 0x0002 /* Ten bit address */
#define I2C_M_NORESTART 0x0080 /* Message should not begin with
* (re-)start of transfer */
/* Access macros */
/* Access macros ************************************************************/
/****************************************************************************
* Name: I2C_SETFREQUENCY