summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2012-09-09 16:11:15 +0200
committerPaul Kocialkowski <contact@paulk.fr>2012-09-09 16:11:15 +0200
commit9de4b7c56d3e3065b002c3a716ec534a0947a2c2 (patch)
tree26ea2e5b5ef9b074a220ec50d5408de0dac95a01
parent7fafa00a882adc2568e768223e0aad6a3790a872 (diff)
downloadhardware_ril_samsung-ril-9de4b7c56d3e3065b002c3a716ec534a0947a2c2.zip
hardware_ril_samsung-ril-9de4b7c56d3e3065b002c3a716ec534a0947a2c2.tar.gz
hardware_ril_samsung-ril-9de4b7c56d3e3065b002c3a716ec534a0947a2c2.tar.bz2
Stick to the latest libsamsung-ipc changes
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
-rw-r--r--gprs.c8
-rw-r--r--sec.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/gprs.c b/gprs.c
index f948077..5a13e91 100644
--- a/gprs.c
+++ b/gprs.c
@@ -509,8 +509,8 @@ int ipc_gprs_connection_enable(struct ril_gprs_connection *gprs_connection,
}
}
- rc = ipc_client_gprs_get_iface(ipc_client, &interface, gprs_connection->cid);
- if(rc < 0) {
+ interface = ipc_client_gprs_get_iface(ipc_client, gprs_connection->cid);
+ if(interface == NULL) {
// This is not a critical issue, fallback to rmnet
LOGE("Failed to get interface name!");
asprintf(&interface, "rmnet%d", gprs_connection->cid - 1);
@@ -589,8 +589,8 @@ int ipc_gprs_connection_disable(struct ril_gprs_connection *gprs_connection)
ipc_client = ((struct ipc_client_object *) ipc_fmt_client->object)->ipc_client;
if(gprs_connection->interface == NULL) {
- rc = ipc_client_gprs_get_iface(ipc_client, &interface, gprs_connection->cid);
- if(rc < 0) {
+ interface = ipc_client_gprs_get_iface(ipc_client, gprs_connection->cid);
+ if(interface == NULL) {
// This is not a critical issue, fallback to rmnet
LOGE("Failed to get interface name!");
asprintf(&interface, "rmnet%d", gprs_connection->cid);
diff --git a/sec.c b/sec.c
index 9ee39a2..a513e78 100644
--- a/sec.c
+++ b/sec.c
@@ -487,7 +487,7 @@ void ril_request_change_sim_pin(RIL_Token t, void *data, size_t datalen)
{
char *password_old = ((char **) data)[0];
char *password_new = ((char **) data)[1];
- struct ipc_sec_change_locking_pw locking_pw;
+ struct ipc_sec_change_locking_pw_set locking_pw;
memset(&locking_pw, 0, sizeof(locking_pw));