summaryrefslogtreecommitdiffstats
path: root/drivers/atmodem/sms.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2010-08-16 22:02:01 +0200
committerMarcel Holtmann <marcel@holtmann.org>2010-08-16 22:02:01 +0200
commita8d3e7433a5485867041a401a4e10604a587dd70 (patch)
tree6ef7c14085728f0e705d0b4c27728c867bcd8a5e /drivers/atmodem/sms.c
parent54c75c47f8df356361a1ecab121d4516652f6dfe (diff)
downloadofono-a8d3e7433a5485867041a401a4e10604a587dd70.tar.bz2
atmodem: Remove useless NULL checks before g_free
Diffstat (limited to 'drivers/atmodem/sms.c')
-rw-r--r--drivers/atmodem/sms.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
index 37bdabe2..7460d78e 100644
--- a/drivers/atmodem/sms.c
+++ b/drivers/atmodem/sms.c
@@ -116,8 +116,7 @@ static void at_csca_set(struct ofono_sms *sms,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, user_data);
}
@@ -182,8 +181,7 @@ static void at_csca_query(struct ofono_sms *sms, ofono_sms_sca_query_cb_t cb,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, NULL, user_data);
}
@@ -246,8 +244,7 @@ static void at_cmgs(struct ofono_sms *sms, unsigned char *pdu, int pdu_len,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, -1, user_data);
}
@@ -280,8 +277,7 @@ static void at_cgsms_set(struct ofono_sms *sms, int bearer,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, user_data);
}
@@ -331,8 +327,7 @@ static void at_cgsms_query(struct ofono_sms *sms,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, -1, user_data);
}
@@ -1227,8 +1222,7 @@ static void at_sms_remove(struct ofono_sms *sms)
{
struct sms_data *data = ofono_sms_get_data(sms);
- if (data->cnma_ack_pdu)
- g_free(data->cnma_ack_pdu);
+ g_free(data->cnma_ack_pdu);
if (data->timeout_source > 0)
g_source_remove(data->timeout_source);