---
src/sim.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/sim.c b/src/sim.c
index d432e1b..d4c7dbf 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -479,7 +479,7 @@ static void sim_op_write_cb(const struct ofono_error *error, void
*data)
{
struct ofono_modem *modem = data;
struct sim_manager_data *sim = modem->sim_manager;
- struct sim_file_op *op = g_queue_pop_head(sim->simop_q);
+ struct sim_file_op *op = g_queue_peek_head(sim->simop_q);
ofono_sim_file_write_cb_t cb = op->cb;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
--
1.6.1
Show replies by date
[Please ignore the first patch, I was fixing the wrong thing]
---
src/sim.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/sim.c b/src/sim.c
index 36ed90b..fb3af83 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -503,12 +503,10 @@ static void sim_op_write_cb(const struct ofono_error *error, void
*data)
struct sim_file_op *op = g_queue_pop_head(sim->simop_q);
ofono_sim_file_write_cb_t cb = op->cb;
- if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
- sim_op_error(modem);
- return;
- }
-
- cb(modem, 1, op->userdata);
+ if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
+ cb(modem, 1, op->userdata);
+ else
+ cb(modem, 0, op->userdata);
sim_file_op_free(op);
--
1.6.1
Applied and pushed. Thanks.
Regards,
-Denis