Re: [PATCH] Radio-setting: Fix to init pending band

Re: [PATCH] Radio-setting: Fix to init pending band

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

Hi Antara,

On 04/27/2016 06:00 PM, Antara Borwankar wrote:
> From: Antara Borwankar <antara.borwankar@gmail.com>
>
> Initialiing rs->pending_band_gsm and rs->pending_band_umts
> ---
>   src/radio-settings.c | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
>

Applied, thanks.

Regards,
-Denis

[PATCH] Radio-setting: Fix to init pending band

[Antara Borwankar]

[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]

From: Antara Borwankar <antara.borwankar@gmail.com>

Initialiing rs->pending_band_gsm and rs->pending_band_umts
---
 src/radio-settings.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/radio-settings.c b/src/radio-settings.c
index 5ab4e7b..8cb3d41 100644
--- a/src/radio-settings.c
+++ b/src/radio-settings.c
@@ -855,6 +855,8 @@ static void radio_load_settings(struct ofono_radio_settings *rs,
 						"GsmBand", rs->band_gsm);
 	}
 
+	rs->pending_band_gsm = rs->band_gsm;
+
 	error = NULL;
 	rs->band_umts = g_key_file_get_integer(rs->settings, SETTINGS_GROUP,
 					"UmtsBand", &error);
@@ -865,6 +867,8 @@ static void radio_load_settings(struct ofono_radio_settings *rs,
 						"UmtsBand", rs->band_umts);
 	}
 
+	rs->pending_band_umts = rs->band_umts;
+
 	error = NULL;
 	rs->mode = g_key_file_get_integer(rs->settings, SETTINGS_GROUP,
 					"TechnologyPreference", &error);
@@ -890,10 +894,8 @@ void ofono_radio_settings_register(struct ofono_radio_settings *rs)
 
 	radio_load_settings(rs, ofono_sim_get_imsi(sim));
 
-	if (rs->driver->set_band == NULL)
-		goto finish;
-
-	rs->driver->set_band(rs, rs->band_gsm, rs->band_umts,
+	if (rs->driver->set_band != NULL)
+		rs->driver->set_band(rs, rs->band_gsm, rs->band_umts,
 					radio_band_set_callback_at_reg, rs);
 
 	if (rs->driver->set_rat_mode == NULL)
-- 
1.9.1