From 227ac8f2e0072cafaffdb26f30df2ded480a611c Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 11 Sep 2009 15:18:27 -0500 Subject: Remove extra free of cbs assembly --- src/cbs.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/cbs.c b/src/cbs.c index df441d13..7b8fde18 100644 --- a/src/cbs.c +++ b/src/cbs.c @@ -426,10 +426,8 @@ static void cbs_remove(struct ofono_atom *atom) if (cbs->driver && cbs->driver->remove) cbs->driver->remove(cbs); - if (cbs->assembly) { - cbs_assembly_free(cbs->assembly); - cbs->assembly = NULL; - } + cbs_assembly_free(cbs->assembly); + cbs->assembly = NULL; g_free(cbs); } @@ -485,12 +483,6 @@ static void sim_watch(struct ofono_atom *atom, if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED) { cbs->imsi_watch = 0; - - if (cbs->assembly) { - cbs_assembly_free(cbs->assembly); - cbs->assembly = NULL; - } - return; } -- cgit v1.2.3