sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

sim: remove locked_pin reset from sim_free_main_state

This commit is contained in:
Samrat Guha Niyogi 2016-08-09 07:11:10 +05:30 committed by Denis Kenzior
parent 2ba2ccbee4
commit 27f9da901f
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/sim.c
View File

@ -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;
@ -2549,7 +2542,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);
}