Merge branch 'jb49714' into 'master'

Register settings atom as soon as we have IMSI

See merge request mer-core/ofono!262

ofono/drivers/ril/ril_modem.c

@@ -218,23 +218,22 @@ static void ril_modem_schedule_online_check(struct ril_modem_data *md)
 static void ril_modem_update_radio_settings(struct ril_modem_data *md)
 {
 	struct ril_modem *m = &md->modem;
-	if (m->radio->state == RADIO_STATE_ON && md->watch->imsi) {
+	struct ofono_radio_settings *rs = ril_modem_radio_settings(m);
+
+	if (md->watch->imsi) {
 		/* radio-settings.c assumes that IMSI is available */
-		if (!ril_modem_radio_settings(m)) {
+		if (!rs) {
 			DBG_(md, "initializing radio settings interface");
 			ofono_radio_settings_create(m->ofono, 0,
 						RILMODEM_DRIVER, md);
 		}
-	} else {
+	} else if (rs) {
-		/* ofono core may remove radio settings atom internally */
-		struct ofono_radio_settings *rs = ril_modem_radio_settings(m);
-		if (rs) {
 		DBG_(md, "removing radio settings interface");
 		ofono_radio_settings_remove(rs);
 	} else {
+		/* ofono core may remove radio settings atom internally */
 		DBG_(md, "radio settings interface is already gone");
 	}
-	}
 }
 
 static void ril_modem_radio_state_cb(struct ril_radio *radio, void *data)
@@ -242,7 +241,6 @@ static void ril_modem_radio_state_cb(struct ril_radio *radio, void *data)
 	struct ril_modem_data *md = data;
 
 	GASSERT(md->modem.radio == radio);
-	ril_modem_update_radio_settings(md);
 	ril_modem_update_online_state(md);
 }