diff options
| author | Jeevaka Badrappan <jeevaka.badrappan@elektrobit.com> | 2011-01-29 05:34:42 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2011-01-29 18:39:37 +0100 |
| commit | 124a9b1f0a9af8c1e4da5ed2fb8f0e88cd8e3fd0 (patch) | |
| tree | c04fe9dca03281ffae6a2f0e561915920b9327f2 /drivers/stemodem | |
| parent | 3fbf85ed829abacef8b244997cd426d8ae47b0fb (diff) | |
| download | ofono-124a9b1f0a9af8c1e4da5ed2fb8f0e88cd8e3fd0.tar.bz2 | |
stemodem: remove NULL check
Diffstat (limited to 'drivers/stemodem')
| -rw-r--r-- | drivers/stemodem/gprs-context.c | 6 | ||||
| -rw-r--r-- | drivers/stemodem/voicecall.c | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c index 0be42389..e247f35a 100644 --- a/drivers/stemodem/gprs-context.c +++ b/drivers/stemodem/gprs-context.c @@ -383,9 +383,6 @@ static void ste_gprs_activate_primary(struct ofono_gprs_context *gc, GSList *l; struct conn_info *conn; - if (cbd == NULL) - goto error_no_device; - gcd->active_context = ctx->cid; cbd->user = gc; @@ -448,9 +445,6 @@ static void ste_gprs_deactivate_primary(struct ofono_gprs_context *gc, char buf[64]; GSList *l; - if (cbd == NULL) - goto error; - gcd->active_context = id; cbd->user = gc; diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c index 5210483a..1c7c0bdc 100644 --- a/drivers/stemodem/voicecall.c +++ b/drivers/stemodem/voicecall.c @@ -187,9 +187,6 @@ static void ste_dial(struct ofono_voicecall *vc, struct cb_data *cbd = cb_data_new(cb, data); char buf[256]; - if (cbd == NULL) - goto error; - cbd->user = vc; if (ph->type == 145) @@ -214,7 +211,6 @@ static void ste_dial(struct ofono_voicecall *vc, atd_cb, cbd, g_free) > 0) return; -error: g_free(cbd); CALLBACK_WITH_FAILURE(cb, data); @@ -370,9 +366,6 @@ static void ste_send_dtmf(struct ofono_voicecall *vc, const char *dtmf, int s; char *buf; - if (cbd == NULL) - goto error; - /* strlen("AT+VTS=) = 7 + NULL */ buf = g_try_new(char, strlen(dtmf) + 8); if (buf == NULL) |