Hi Frédéric, > @@ -1968,6 +2024,13 @@ void ofono_netreg_register(struct ofono_netreg *netreg) > netreg->hfp_watch = __ofono_modem_add_atom_watch(modem, > OFONO_ATOM_TYPE_EMULATOR_HFP, > emulator_hfp_watch, netreg, NULL); > + > + hfp_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_EMULATOR_HFP); > + > + if (hfp_atom && __ofono_atom_get_registered(hfp_atom)) > + emulator_hfp_watch(hfp_atom, > + OFONO_ATOM_WATCH_CONDITION_REGISTERED, > + netreg); There might be multiple HFP_EMULATOR atoms, so you should use __ofono_modem_foreach_atom() here Rest of the patch looks fine to me. Regards, -Denis