diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/atmodem/network-registration.c | 4 | ||||
| -rw-r--r-- | drivers/isimodem/isimodem.c | 2 | ||||
| -rw-r--r-- | drivers/isimodem/network-registration.c | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c index 10025193..79c59a08 100644 --- a/drivers/atmodem/network-registration.c +++ b/drivers/atmodem/network-registration.c @@ -636,9 +636,9 @@ static void at_network_registration_initialized(gboolean ok, GAtResult *result, ofono_netreg_register(netreg); } -static int at_netreg_probe(struct ofono_netreg *netreg) +static int at_netreg_probe(struct ofono_netreg *netreg, int vendor, void *data) { - GAtChat *chat = ofono_netreg_get_data(netreg); + GAtChat *chat = data; struct netreg_data *nd; nd = g_new0(struct netreg_data, 1); diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index bac6167c..f8cde0c5 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -151,7 +151,7 @@ static int isi_modem_populate(struct ofono_modem *modem) ofono_devinfo_create(isi->modem, 0, "isi", isi->idx); ofono_phonebook_create(isi->modem, "isi", isi->idx); - ofono_netreg_create(isi->modem, "isi", isi->idx); + ofono_netreg_create(isi->modem, 0, "isi", isi->idx); ofono_voicecall_create(isi->modem, "isi", isi->idx); ofono_sms_create(isi->modem, "isi", isi->idx); ofono_sim_create(isi->modem, "isi", isi->idx); diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c index 88483903..e00994bf 100644 --- a/drivers/isimodem/network-registration.c +++ b/drivers/isimodem/network-registration.c @@ -178,21 +178,21 @@ static gboolean isi_netreg_register(gpointer user) return FALSE; } -static int isi_netreg_probe(struct ofono_netreg *netreg) +static int isi_netreg_probe(struct ofono_netreg *netreg, int vendor, void *user) { - GIsiModem *idx = ofono_netreg_get_data(netreg); - struct netreg_data *user = g_try_new0(struct netreg_data, 1); + GIsiModem *idx = user; + struct netreg_data *data = g_try_new0(struct netreg_data, 1); - if (!user) + if (!data) return -ENOMEM; - user->client = g_isi_client_create(idx, PN_NETWORK); - if (!user->client) { - g_free(user); + data->client = g_isi_client_create(idx, PN_NETWORK); + if (!data->client) { + g_free(data); return -ENOMEM; } - ofono_netreg_set_data(netreg, user); + ofono_netreg_set_data(netreg, data); g_idle_add(isi_netreg_register, netreg); |