diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/atmodem/call-settings.c | 6 | ||||
| -rw-r--r-- | drivers/isimodem/call-settings.c | 10 | ||||
| -rw-r--r-- | drivers/isimodem/isimodem.c | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c index 8c0f1dff..d540ec16 100644 --- a/drivers/atmodem/call-settings.c +++ b/drivers/atmodem/call-settings.c @@ -365,8 +365,12 @@ static gboolean at_call_settings_register(gpointer user) return FALSE; } -static int at_call_settings_probe(struct ofono_call_settings *cs) +static int at_call_settings_probe(struct ofono_call_settings *cs, int vendor, + void *data) { + GAtChat *chat = data; + + ofono_call_settings_set_data(cs, chat); g_idle_add(at_call_settings_register, cs); return 0; diff --git a/drivers/isimodem/call-settings.c b/drivers/isimodem/call-settings.c index 99129618..f564f0e8 100644 --- a/drivers/isimodem/call-settings.c +++ b/drivers/isimodem/call-settings.c @@ -83,15 +83,19 @@ static void isi_cw_set(struct ofono_call_settings *cs, int mode, int cls, { } -static int isi_call_settings_probe(struct ofono_call_settings *cs) +static int isi_call_settings_probe(struct ofono_call_settings *cs, int vendor, + void *user) { - GIsiModem *idx = ofono_call_settings_get_data(cs); - struct call_settings_data *data = g_try_new0(struct call_settings_data, 1); + GIsiModem *idx = user; + struct call_settings_data *data; + + data = g_try_new0(struct call_settings_data, 1); if (!data) return -ENOMEM; data->client = g_isi_client_create(idx, PN_SS); + if (!data->client) return -ENOMEM; diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index becda1f5..c97eaee5 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -158,7 +158,7 @@ static int isi_modem_populate(struct ofono_modem *modem) ofono_ssn_create(isi->modem, "isi", isi->idx); ofono_ussd_create(isi->modem, "isi", isi->idx); ofono_call_forwarding_create(isi->modem, 0, "isi", isi->idx); - ofono_call_settings_create(isi->modem, "isi", isi->idx); + ofono_call_settings_create(isi->modem, 0, "isi", isi->idx); ofono_call_barring_create(isi->modem, 0, "isi", isi->idx); ofono_call_meter_create(isi->modem, 0, "isi", isi->idx); |