summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipc.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/ipc.c b/ipc.c
index 0f7379d..1a6c877 100644
--- a/ipc.c
+++ b/ipc.c
@@ -1013,12 +1013,22 @@ int ipc_rfs_loop(struct ril_client *client)
eventfd_t event;
int rc;
- if (client == NULL || client->data == NULL)
+ if (client == NULL) {
+ RIL_LOGE("%s client is NULL", client->name);
return -1;
+ } else if (client->data == NULL) {
+ RIL_LOGE("%s client data is NULL", client->name);
+ return -1;
+ }
data = (struct ipc_rfs_data *) client->data;
- if (data->ipc_client == NULL || data->event_fd < 0)
+ if (data->ipc_client == NULL) {
+ RIL_LOGE("%s data ipc_client is NULL", client->name);
return -1;
+ } else if (data->event_fd < 0) {
+ RIL_LOGE("%s data event_fd < 0", client->name);
+ return -1;
+ }
memset(&fds, 0, sizeof(fds));
fds.fds = (int *) &fds_array;