diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-08 15:07:53 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-08 15:07:53 +0000 |
| commit | 7cc9218389c6b2b214759675418629510c1544a9 (patch) | |
| tree | c9f6aaf1d3d53d3900c3199488ea02c20e270173 /nuttx/drivers | |
| parent | 58688272d3010ac12cdd8c90f96cdd2dd0c2c37a (diff) | |
| download | px4-firmware-7cc9218389c6b2b214759675418629510c1544a9.tar.gz px4-firmware-7cc9218389c6b2b214759675418629510c1544a9.tar.bz2 px4-firmware-7cc9218389c6b2b214759675418629510c1544a9.zip | |
Integrate the STMPE11 driver into the STM3240G-EVAL board logic
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4714 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/drivers')
| -rw-r--r-- | nuttx/drivers/input/stmpe11_base.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nuttx/drivers/input/stmpe11_base.c b/nuttx/drivers/input/stmpe11_base.c index 1e8c7d58a..cabd33db2 100644 --- a/nuttx/drivers/input/stmpe11_base.c +++ b/nuttx/drivers/input/stmpe11_base.c @@ -47,6 +47,7 @@ #include <debug.h> #include <nuttx/arch.h> +#include <nuttx/kmalloc.h> #include <nuttx/input/stmpe11.h> #include "stmpe11.h" @@ -163,7 +164,7 @@ static int stmpe11_interrupt(int irq, FAR void *context) priv = &g_stmpe11; #else for (priv = g_stmpe11list; - priv && priv->configs->irq != irq; + priv && priv->config->irq != irq; priv = priv->flink); ASSERT(priv != NULL); @@ -296,7 +297,7 @@ STMPE11_HANDLE stmpe11_instantiate(FAR struct i2c_dev_s *dev, priv = (FAR struct stmpe11_dev_s *)kzalloc(sizeof(struct stmpe11_dev_s)); if (!priv) { - return -ENOMEM; + return NULL; } /* And save the device structure in the list of STMPE11 so that we can find it later */ |