summaryrefslogtreecommitdiffstats
path: root/drivers/isimodem/call-forwarding.c
diff options
context:
space:
mode:
authorAki Niemi <aki.niemi@nokia.com>2010-04-27 15:10:55 +0300
committerAki Niemi <aki.niemi@nokia.com>2010-04-27 23:21:48 +0300
commitc123a9b5ba691755dcd054c1990a585190ee3af8 (patch)
treee2928ea61bd62af7480c47cfd4489ec30beb81a9 /drivers/isimodem/call-forwarding.c
parenta03d11fec71c35364ffe0d328379533ad8491f5d (diff)
downloadofono-c123a9b5ba691755dcd054c1990a585190ee3af8.tar.bz2
Fix remove ops in isimodem drivers
Diffstat (limited to 'drivers/isimodem/call-forwarding.c')
-rw-r--r--drivers/isimodem/call-forwarding.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/isimodem/call-forwarding.c b/drivers/isimodem/call-forwarding.c
index efa9bfec..61d3cfa0 100644
--- a/drivers/isimodem/call-forwarding.c
+++ b/drivers/isimodem/call-forwarding.c
@@ -557,10 +557,12 @@ static void isi_call_forwarding_remove(struct ofono_call_forwarding *cf)
{
struct forw_data *data = ofono_call_forwarding_get_data(cf);
- if (data) {
- g_isi_client_destroy(data->client);
- g_free(data);
- }
+ if (!data)
+ return;
+
+ ofono_call_forwarding_set_data(cf, NULL);
+ g_isi_client_destroy(data->client);
+ g_free(data);
}
static struct ofono_call_forwarding_driver driver = {