diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/atmodem/call-forwarding.c | 6 | ||||
| -rw-r--r-- | drivers/isimodem/call-forwarding.c | 9 | ||||
| -rw-r--r-- | drivers/isimodem/isimodem.c | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/drivers/atmodem/call-forwarding.c b/drivers/atmodem/call-forwarding.c index d6224680..24fd8332 100644 --- a/drivers/atmodem/call-forwarding.c +++ b/drivers/atmodem/call-forwarding.c @@ -262,8 +262,12 @@ static gboolean at_ccfc_register(gpointer user) return FALSE; } -static int at_ccfc_probe(struct ofono_call_forwarding *cf) +static int at_ccfc_probe(struct ofono_call_forwarding *cf, int vendor, + void *data) { + GAtChat *chat = data; + + ofono_call_forwarding_set_data(cf, chat); g_idle_add(at_ccfc_register, cf); return 0; diff --git a/drivers/isimodem/call-forwarding.c b/drivers/isimodem/call-forwarding.c index 08236c8c..ce5e40f0 100644 --- a/drivers/isimodem/call-forwarding.c +++ b/drivers/isimodem/call-forwarding.c @@ -79,10 +79,13 @@ static void isi_query(struct ofono_call_forwarding *cf, int type, int cls, { } -static int isi_call_forwarding_probe(struct ofono_call_forwarding *cf) +static int isi_call_forwarding_probe(struct ofono_call_forwarding *cf, + int vendor, void *user) { - GIsiModem *idx = ofono_call_forwarding_get_data(cf); - struct call_forwarding_data *data = g_try_new0(struct call_forwarding_data, 1); + GIsiModem *idx = user; + struct call_forwarding_data *data; + + data = g_try_new0(struct call_forwarding_data, 1); if (!data) return -ENOMEM; diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index 22e467ed..bac07fc0 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -157,7 +157,7 @@ static int isi_modem_populate(struct ofono_modem *modem) ofono_sim_create(isi->modem, "isi", isi->idx); ofono_ssn_create(isi->modem, "isi", isi->idx); ofono_ussd_create(isi->modem, "isi", isi->idx); - ofono_call_forwarding_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_barring_create(isi->modem, 0, "isi", isi->idx); ofono_call_meter_create(isi->modem, "isi", isi->idx); |