diff options
| author | Jeevaka Badrappan <jeevaka.badrappan@elektrobit.com> | 2011-01-29 05:34:41 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2011-01-29 18:39:37 +0100 |
| commit | 3fbf85ed829abacef8b244997cd426d8ae47b0fb (patch) | |
| tree | 0bb14d084407efe87c6e6af32d116ac640376e54 /drivers/mbmmodem | |
| parent | 52e46e42ffade1925a783f1d649573262b5e67ca (diff) | |
| download | ofono-3fbf85ed829abacef8b244997cd426d8ae47b0fb.tar.bz2 | |
mbmmodem: remove NULL check
Diffstat (limited to 'drivers/mbmmodem')
| -rw-r--r-- | drivers/mbmmodem/gprs-context.c | 7 | ||||
| -rw-r--r-- | drivers/mbmmodem/stk.c | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/mbmmodem/gprs-context.c b/drivers/mbmmodem/gprs-context.c index b9b4574e..322f96d7 100644 --- a/drivers/mbmmodem/gprs-context.c +++ b/drivers/mbmmodem/gprs-context.c @@ -364,9 +364,6 @@ static void mbm_gprs_activate_primary(struct ofono_gprs_context *gc, DBG("cid %u", ctx->cid); - if (cbd == NULL) - goto error; - gcd->active_context = ctx->cid; cbd->user = gc; @@ -408,16 +405,12 @@ static void mbm_gprs_deactivate_primary(struct ofono_gprs_context *gc, DBG("cid %u", cid); - if (cbd == NULL) - goto error; - cbd->user = gc; if (g_at_chat_send(gcd->chat, "AT*ENAP=0", none_prefix, at_enap_down_cb, cbd, g_free) > 0) return; -error: g_free(cbd); CALLBACK_WITH_FAILURE(cb, data); diff --git a/drivers/mbmmodem/stk.c b/drivers/mbmmodem/stk.c index d0a9f3b2..99c08c2d 100644 --- a/drivers/mbmmodem/stk.c +++ b/drivers/mbmmodem/stk.c @@ -88,7 +88,7 @@ static void mbm_stk_envelope(struct ofono_stk *stk, int length, DBG(""); - if (cbd == NULL || buf == NULL) + if (buf == NULL) goto error; len = sprintf(buf, "AT*STKE=\""); @@ -134,7 +134,7 @@ static void mbm_stk_terminal_response(struct ofono_stk *stk, int length, DBG(""); - if (cbd == NULL || buf == NULL) + if (buf == NULL) goto error; len = sprintf(buf, "AT*STKR=\""); |