calypsomodem: remove NULL check

diff --git a/drivers/calypsomodem/stk.c b/drivers/calypsomodem/stk.c
index 196b9e3..83287f9 100644 (file)
--- a/drivers/calypsomodem/stk.c
+++ b/drivers/calypsomodem/stk.c
@@ -101,7 +101,7 @@ static void calypso_stk_envelope(struct ofono_stk *stk, int length,
 
        DBG("");
 
-       if (cbd == NULL || buf == NULL)
+       if (buf == NULL)
                goto error;
 
        len = sprintf(buf, "AT%%SATE=\"");
@@ -148,7 +148,7 @@ static void calypso_stk_terminal_response(struct ofono_stk *stk, int length,
 
        DBG("");
 
-       if (cbd == NULL || buf == NULL)
+       if (buf == NULL)
                goto error;
 
        len = sprintf(buf, "AT%%SATR=\"");

diff --git a/drivers/calypsomodem/voicecall.c b/drivers/calypsomodem/voicecall.c
index 204ed14..01be990 100644 (file)
--- a/drivers/calypsomodem/voicecall.c
+++ b/drivers/calypsomodem/voicecall.c
@@ -64,14 +64,10 @@ static void calypso_template(struct ofono_voicecall *vc, const char *cmd,
        struct voicecall_data *vd = ofono_voicecall_get_data(vc);
        struct cb_data *cbd = cb_data_new(cb, data);
 
-       if (cbd == NULL)
-               goto error;
-
        if (g_at_chat_send(vd->chat, cmd, none_prefix,
                                calypso_generic_cb, cbd, g_free) > 0)
                return;
 
-error:
        g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, data);