summaryrefslogtreecommitdiff
path: root/drivers/rilmodem
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2017-02-07 11:05:09 -0600
committerDenis Kenzior <denkenz@gmail.com>2017-02-07 11:05:09 -0600
commit149002c1100d0ff5e8c7ee4a096e34012853cc88 (patch)
tree1cc007df571078b1aaa38f2f0f8dc5bbf0e53a25 /drivers/rilmodem
parentf48025d8413bc88e3bcfe267e64d560b36216c6b (diff)
downloadofono-149002c1100d0ff5e8c7ee4a096e34012853cc88.tar.gz
rilmodem: Fix warning
drivers/rilmodem/stk.c: In function ‘ril_stk_probe’: drivers/rilmodem/stk.c:210:18: error: ‘data’ is used uninitialized in this function [-Werror=uninitialized] struct cb_data *cbd = cb_data_new(stk, NULL, data);
Diffstat (limited to 'drivers/rilmodem')
-rw-r--r--drivers/rilmodem/stk.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/rilmodem/stk.c b/drivers/rilmodem/stk.c
index 5120c079..bd9a6c88 100644
--- a/drivers/rilmodem/stk.c
+++ b/drivers/rilmodem/stk.c
@@ -186,9 +186,8 @@ static void ril_stk_session_end_notify(struct ril_msg *message,
static void ril_stk_initialize_cb(struct ril_msg *message,
gpointer user_data)
{
- struct cb_data *cbd = user_data;
- struct ofono_stk *stk = cbd->cb;
- struct stk_data *sd = cbd->user;
+ struct ofono_stk *stk = user_data;
+ struct stk_data *sd = ofono_stk_get_data(stk);
if (message->error != RIL_E_SUCCESS) {
ofono_error("%s RILD reply failure: %s",
@@ -207,7 +206,6 @@ static int ril_stk_probe(struct ofono_stk *stk, unsigned int vendor,
{
GRil *ril = user;
struct stk_data *data;
- struct cb_data *cbd = cb_data_new(stk, NULL, data);
data = g_new0(struct stk_data, 1);
data->ril = g_ril_clone(ril);
@@ -225,7 +223,7 @@ static int ril_stk_probe(struct ofono_stk *stk, unsigned int vendor,
ril_stk_event_notify, stk);
g_ril_send(data->ril, RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING, NULL,
- ril_stk_initialize_cb, cbd, g_free);
+ ril_stk_initialize_cb, stk, NULL);
return 0;
}