aboutsummaryrefslogtreecommitdiffstats
path: root/samsung-ipc/device
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2012-09-07 17:11:19 +0200
committerPaul Kocialkowski <contact@paulk.fr>2012-09-07 17:11:19 +0200
commit807ad0478f8805de91f185021a666111a6abb4a7 (patch)
treedb530e529de01b578aa6d8de148f3a53cc62835e /samsung-ipc/device
parente426cc47a0939cbd5b76137f4e4bd752100fadc0 (diff)
downloadexternal_libsamsung-ipc-807ad0478f8805de91f185021a666111a6abb4a7.zip
external_libsamsung-ipc-807ad0478f8805de91f185021a666111a6abb4a7.tar.gz
external_libsamsung-ipc-807ad0478f8805de91f185021a666111a6abb4a7.tar.bz2
Aries: Use new IPC open/close definitions
Change-Id: I348c615371bcc24796ea0b7ea33a32eab23709c4 Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'samsung-ipc/device')
-rw-r--r--samsung-ipc/device/aries/aries_ipc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/samsung-ipc/device/aries/aries_ipc.c b/samsung-ipc/device/aries/aries_ipc.c
index 790b34a..4860724 100644
--- a/samsung-ipc/device/aries/aries_ipc.c
+++ b/samsung-ipc/device/aries/aries_ipc.c
@@ -562,14 +562,12 @@ int aries_ipc_rfs_client_recv(struct ipc_client *client, struct ipc_message_info
return 0;
}
-int aries_ipc_open(void *data, unsigned int size, void *io_data)
+int aries_ipc_open(int type, void *io_data)
{
struct aries_ipc_handlers_common_data *common_data;
struct sockaddr_pn *spn;
struct ifreq ifr;
- int type = *((int *) data);
-
int reuse;
int socket_rfs_magic;
@@ -582,6 +580,9 @@ int aries_ipc_open(void *data, unsigned int size, void *io_data)
common_data = (struct aries_ipc_handlers_common_data *) io_data;
spn = common_data->spn;
+ if(spn == NULL)
+ goto error;
+
memset(&ifr, 0, sizeof(ifr));
memset(ifr.ifr_name, 0, IFNAMSIZ);
memset(spn, 0, sizeof(struct sockaddr_pn));
@@ -647,7 +648,7 @@ end:
return 0;
}
-int aries_ipc_close(void *data, unsigned int size, void *io_data)
+int aries_ipc_close(void *io_data)
{
struct aries_ipc_handlers_common_data *common_data;
int fd = -1;