summaryrefslogtreecommitdiffstats
path: root/drivers/atmodem/ussd.c
diff options
context:
space:
mode:
authorJeevaka Badrappan <jeevaka.badrappan@elektrobit.com>2011-01-29 05:34:35 -0800
committerMarcel Holtmann <marcel@holtmann.org>2011-01-29 18:39:37 +0100
commit4258fb591599534f6447c1371e92427ccece5f51 (patch)
treecc63cb91c9421fbce447c1d13248b8abb59f9600 /drivers/atmodem/ussd.c
parentac20890cc90e8a36ad1937e53bb19e2f528639d1 (diff)
downloadofono-4258fb591599534f6447c1371e92427ccece5f51.tar.bz2
atmodem: remove NULL check
Diffstat (limited to 'drivers/atmodem/ussd.c')
-rw-r--r--drivers/atmodem/ussd.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c
index 8b429267..f8cde2da 100644
--- a/drivers/atmodem/ussd.c
+++ b/drivers/atmodem/ussd.c
@@ -187,9 +187,6 @@ static void at_ussd_request(struct ofono_ussd *ussd, int dcs,
char buf[512];
enum sms_charset charset;
- if (cbd == NULL)
- goto error;
-
cbd->user = ussd;
if (!cbs_dcs_decode(dcs, NULL, NULL, &charset,
@@ -273,16 +270,12 @@ static void at_ussd_cancel(struct ofono_ussd *ussd,
struct ussd_data *data = ofono_ussd_get_data(ussd);
struct cb_data *cbd = cb_data_new(cb, user_data);
- if (cbd == NULL)
- goto error;
-
cbd->user = data;
if (g_at_chat_send(data->chat, "AT+CUSD=2", none_prefix,
cusd_cancel_cb, cbd, g_free) > 0)
return;
-error:
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, user_data);