diff options
Diffstat (limited to 'drivers/isimodem')
-rw-r--r-- | drivers/isimodem/call-barring.c | 2 | ||||
-rw-r--r-- | drivers/isimodem/isimodem.c | 3 | ||||
-rw-r--r-- | drivers/isimodem/network-registration.c | 12 | ||||
-rw-r--r-- | drivers/isimodem/sim.c | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/drivers/isimodem/call-barring.c b/drivers/isimodem/call-barring.c index c28cd583..fbbed8bc 100644 --- a/drivers/isimodem/call-barring.c +++ b/drivers/isimodem/call-barring.c @@ -232,7 +232,7 @@ static bool query_resp_cb(GIsiClient *client, const void *restrict data, if (!g_isi_sb_iter_get_byte(&iter, &bsc, 3 + i)) goto error; - update_status_mask(&mask, bsc); + update_status_mask(&mask, bsc); } break; } diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index cb60716f..48f41c38 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -153,7 +153,7 @@ static void netlink_status_cb(bool up, uint8_t addr, GIsiModem *idx, DBG("PhoNet is %s, addr=0x%02x, idx=%p", up ? "up" : "down", addr, idx); - + if (up) { if (isi) { @@ -181,7 +181,6 @@ static void netlink_status_cb(bool up, uint8_t addr, GIsiModem *idx, DBG("Done regging modem"); } else { - if (!isi) { DBG("Unknown modem: (0x%02x)", g_isi_modem_index(idx)); diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c index 7730a9e7..6feff545 100644 --- a/drivers/isimodem/network-registration.c +++ b/drivers/isimodem/network-registration.c @@ -267,7 +267,7 @@ error: if (cbd) g_free(cbd); - CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data); + CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data); } static bool name_get_resp_cb(GIsiClient *client, const void *restrict data, @@ -334,7 +334,7 @@ static bool name_get_resp_cb(GIsiClient *client, const void *restrict data, CALLBACK_WITH_SUCCESS(cb, &op, cbd->data); goto out; - + error: CALLBACK_WITH_FAILURE(cb, NULL, cbd->data); @@ -618,7 +618,7 @@ static void isi_register_manual(struct ofono_netreg *netreg, 0x08, /* Sub-block length */ bcd[0], bcd[1], bcd[2], NET_GSM_BAND_INFO_NOT_AVAIL, /* Pick any supported band */ - 0x00, 0x00 /* Filler */ + 0x00, 0x00 /* Filler */ }; if (!cbd) @@ -650,7 +650,7 @@ static void rat_ind_cb(GIsiClient *client, const void *restrict data, struct netreg_data *nd = ofono_netreg_get_data(netreg); GIsiSubBlockIter iter; - + if (!msg || len < 3 || msg[0] != NET_RAT_IND) return; @@ -662,7 +662,7 @@ static void rat_ind_cb(GIsiClient *client, const void *restrict data, case NET_RAT_INFO: { guint8 info = 0; - + if (!g_isi_sb_iter_get_byte(&iter, &nd->rat, 2)) return; @@ -716,7 +716,7 @@ static bool rat_resp_cb(GIsiClient *client, const void *restrict data, case NET_RAT_INFO: { guint8 info = 0; - + if (!g_isi_sb_iter_get_byte(&iter, &nd->rat, 2) || !g_isi_sb_iter_get_byte(&iter, &info, 3) || !info diff --git a/drivers/isimodem/sim.c b/drivers/isimodem/sim.c index 1e92a3d0..cebe8f25 100644 --- a/drivers/isimodem/sim.c +++ b/drivers/isimodem/sim.c @@ -222,7 +222,7 @@ static bool imsi_resp_cb(GIsiClient *client, const void *restrict data, octets = msg[3]; if (octets != 8 || octets > len) goto error; - + msg += 4; /* Ignore the low-order semi-octet of the first byte */ @@ -263,7 +263,7 @@ static void isi_read_imsi(struct ofono_sim *sim, if (!cbd) goto error; - if (g_isi_request_make(sd->client, msg, sizeof(msg), + if (g_isi_request_make(sd->client, msg, sizeof(msg), SIM_TIMEOUT, imsi_resp_cb, cbd)) return; |