* [PATCH] sim: remove locked_pin reset from sim_free_main_state
@ 2016-08-09 1:41 Samrat Guha Niyogi
2016-08-09 2:17 ` Denis Kenzior
0 siblings, 1 reply; 2+ messages in thread
From: Samrat Guha Niyogi @ 2016-08-09 1:41 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --]
---
src/sim.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/sim.c b/src/sim.c
index 0bbd1ef..ab5f2c6 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -2372,13 +2372,6 @@ static void sim_spn_close(struct ofono_sim *sim)
static void sim_free_main_state(struct ofono_sim *sim)
{
- int i;
-
- for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
- sim->pin_retries[i] = -1;
-
- memset(sim->locked_pins, 0, sizeof(sim->locked_pins));
-
if (sim->imsi) {
g_free(sim->imsi);
sim->imsi = NULL;
@@ -2547,7 +2540,24 @@ void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted)
sim_initialize(sim);
}
} else {
- sim->pin_type = OFONO_SIM_PASSWORD_NONE;
+ switch (sim->pin_type) {
+ case OFONO_SIM_PASSWORD_SIM_PIN:
+ case OFONO_SIM_PASSWORD_SIM_PUK:
+ case OFONO_SIM_PASSWORD_SIM_PIN2:
+ case OFONO_SIM_PASSWORD_SIM_PUK2:
+ sim->pin_type = OFONO_SIM_PASSWORD_NONE;
+ break;
+ default:
+ break;
+ }
+
+ sim->locked_pins[OFONO_SIM_PASSWORD_SIM_PIN] = FALSE;
+ sim->locked_pins[OFONO_SIM_PASSWORD_SIM_PIN2] = FALSE;
+
+ sim->pin_retries[OFONO_SIM_PASSWORD_SIM_PIN] = -1;
+ sim->pin_retries[OFONO_SIM_PASSWORD_SIM_PUK] = -1;
+ sim->pin_retries[OFONO_SIM_PASSWORD_SIM_PIN2] = -1;
+ sim->pin_retries[OFONO_SIM_PASSWORD_SIM_PUK2] = -1;
sim_free_state(sim);
}
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sim: remove locked_pin reset from sim_free_main_state
2016-08-09 1:41 [PATCH] sim: remove locked_pin reset from sim_free_main_state Samrat Guha Niyogi
@ 2016-08-09 2:17 ` Denis Kenzior
0 siblings, 0 replies; 2+ messages in thread
From: Denis Kenzior @ 2016-08-09 2:17 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
Hi Samrat,
On 08/08/2016 08:41 PM, Samrat Guha Niyogi wrote:
> ---
> src/sim.c | 26 ++++++++++++++++++--------
> 1 file changed, 18 insertions(+), 8 deletions(-)
>
Applied, thanks.
Regards,
-Denis
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-09 2:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-09 1:41 [PATCH] sim: remove locked_pin reset from sim_free_main_state Samrat Guha Niyogi
2016-08-09 2:17 ` Denis Kenzior
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.