From de221f87fa2c5e3048a7c93301d4784b05daa5db Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 16 Aug 2010 22:11:21 +0200 Subject: stemodem: Remove useless NULL checks before g_free --- drivers/stemodem/gprs-context.c | 9 +++------ drivers/stemodem/voicecall.c | 12 ++++-------- 2 files changed, 7 insertions(+), 14 deletions(-) (limited to 'drivers/stemodem') diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c index ace9d6e9..d3a50a92 100644 --- a/drivers/stemodem/gprs-context.c +++ b/drivers/stemodem/gprs-context.c @@ -352,8 +352,7 @@ static void ste_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data) return; error: - if (ncbd) - g_free(ncbd); + g_free(ncbd); gcd->active_context = 0; @@ -399,8 +398,7 @@ static void ste_gprs_activate_primary(struct ofono_gprs_context *gc, return; error: - if (cbd) - g_free(cbd); + g_free(cbd); CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data); } @@ -439,8 +437,7 @@ static void ste_gprs_deactivate_primary(struct ofono_gprs_context *gc, return; error: - if (cbd) - g_free(cbd); + g_free(cbd); CALLBACK_WITH_FAILURE(cb, data); } diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c index aa5a071a..5cf38bb4 100644 --- a/drivers/stemodem/voicecall.c +++ b/drivers/stemodem/voicecall.c @@ -222,8 +222,7 @@ static void ste_dial(struct ofono_voicecall *vc, return; error: - if (cbd) - g_free(cbd); + g_free(cbd); CALLBACK_WITH_FAILURE(cb, data); } @@ -248,8 +247,7 @@ static void ste_template(const char *cmd, struct ofono_voicecall *vc, return; error: - if (req) - g_free(req); + g_free(req); CALLBACK_WITH_FAILURE(cb, data); } @@ -315,8 +313,7 @@ static void ste_release_specific(struct ofono_voicecall *vc, int id, return; error: - if (req) - g_free(req); + g_free(req); CALLBACK_WITH_FAILURE(cb, data); } @@ -401,8 +398,7 @@ static void ste_send_dtmf(struct ofono_voicecall *vc, const char *dtmf, return; error: - if (cbd) - g_free(cbd); + g_free(cbd); CALLBACK_WITH_FAILURE(cb, data); } -- cgit v1.2.3