Rename vd->call to vd->active_call in hfpmodem voicecall.c --- drivers/hfpmodem/voicecall.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c index 9ba72e4..60ac45d 100644 --- a/drivers/hfpmodem/voicecall.c +++ b/drivers/hfpmodem/voicecall.c @@ -53,7 +53,7 @@ static const char *chld_prefix[] = { "+CHLD:", NULL }; struct voicecall_data { GAtChat *chat; GSList *calls; - struct ofono_call *call; + struct ofono_call *active_call; unsigned int ag_features; unsigned int ag_mpty_features; unsigned char cind_pos[HFP_INDICATOR_LAST]; @@ -103,7 +103,7 @@ static struct ofono_call *create_call(struct voicecall_data *d, int type, call->clip_validity = clip; - d->call = call; + d->active_call = call; return call; } @@ -339,8 +339,8 @@ static void release_call(struct ofono_voicecall *vc, struct ofono_call *call) vd->calls = g_slist_remove(vd->calls, call); - if (call == vd->call) - vd->call = NULL; + if (call == vd->active_call) + vd->active_call = NULL; g_free(call); } @@ -403,7 +403,7 @@ static void ciev_notify(GAtResult *result, gpointer user_data) { struct ofono_voicecall *vc = user_data; struct voicecall_data *vd = ofono_voicecall_get_data(vc); - struct ofono_call *call = vd->call; + struct ofono_call *call = vd->active_call; int index; int value; GAtResultIter iter; @@ -491,7 +491,7 @@ static int hfp_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor, vd->chat = data->chat; vd->ag_features = data->ag_features; - vd->call = NULL; + vd->active_call = NULL; memcpy(vd->cind_pos, data->cind_pos, HFP_INDICATOR_LAST); memcpy(vd->cind_val, data->cind_val, HFP_INDICATOR_LAST); -- 1.6.2.5