* [PATCH] Correct a copy+paste error in SIM write callback.
@ 2009-08-03 12:51 Andrzej Zaborowski
2009-08-04 3:39 ` [PATCH] Fix " Andrzej Zaborowski
0 siblings, 1 reply; 3+ messages in thread
From: Andrzej Zaborowski @ 2009-08-03 12:51 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 601 bytes --]
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] Fix a copy+paste error in SIM write callback.
2009-08-03 12:51 [PATCH] Correct a copy+paste error in SIM write callback Andrzej Zaborowski
@ 2009-08-04 3:39 ` Andrzej Zaborowski
2009-08-04 20:17 ` Denis Kenzior
0 siblings, 1 reply; 3+ messages in thread
From: Andrzej Zaborowski @ 2009-08-04 3:39 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 746 bytes --]
[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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix a copy+paste error in SIM write callback.
2009-08-04 3:39 ` [PATCH] Fix " Andrzej Zaborowski
@ 2009-08-04 20:17 ` Denis Kenzior
0 siblings, 0 replies; 3+ messages in thread
From: Denis Kenzior @ 2009-08-04 20:17 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 50 bytes --]
Applied and pushed. Thanks.
Regards,
-Denis
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-08-04 20:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-03 12:51 [PATCH] Correct a copy+paste error in SIM write callback Andrzej Zaborowski
2009-08-04 3:39 ` [PATCH] Fix " Andrzej Zaborowski
2009-08-04 20: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.