diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-09 21:12:20 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-09 21:12:20 +0000 |
| commit | dda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5 (patch) | |
| tree | 0af32db840a032a50312791977b7d129def1d5b3 /nuttx/graphics/nxmu/nx_connect.c | |
| parent | 2ac33dcffabd9422659c3b013ed8624c09ae90e4 (diff) | |
| download | px4-nuttx-dda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5.tar.gz px4-nuttx-dda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5.tar.bz2 px4-nuttx-dda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5.zip | |
More changes for a kernel-mode allocator (more to be done)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5724 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/graphics/nxmu/nx_connect.c')
| -rw-r--r-- | nuttx/graphics/nxmu/nx_connect.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nuttx/graphics/nxmu/nx_connect.c b/nuttx/graphics/nxmu/nx_connect.c index 4d91b54d5..2c14579ee 100644 --- a/nuttx/graphics/nxmu/nx_connect.c +++ b/nuttx/graphics/nxmu/nx_connect.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_connect.c * - * Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -47,7 +47,9 @@ #include <errno.h> #include <debug.h> +#include <nuttx/kmalloc.h> #include <nuttx/nx/nx.h> + #include "nxfe.h" /**************************************************************************** @@ -130,7 +132,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname) /* Allocate the NX client structure */ - conn = (FAR struct nxfe_conn_s *)zalloc(sizeof(struct nxfe_conn_s)); + conn = (FAR struct nxfe_conn_s *)kzalloc(sizeof(struct nxfe_conn_s)); if (!conn) { errno = ENOMEM; @@ -213,7 +215,7 @@ errout_with_wmq: errout_with_rmq: mq_close(conn->crdmq); errout_with_conn: - free(conn); + kfree(conn); errout: return NULL; } |