aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2012-05-31 17:23:08 -0500
committerDan Williams <dcbw@redhat.com>2012-07-18 22:34:16 -0500
commite92ce19c57fcb1e5c6c32703c9e62895f033171d (patch)
tree7dae694c5125a7f23e85b272a1cf37ecc8fbaa3e
parentcc3f65111620c0e968608a4d8ba66290af91094e (diff)
cdma: fix QCDM registration state checking
Broken by b22b2d99db57e4cec8e6c3074dd20acd6845cb62 which changed the return types of the qcdm_result_get_*() function, but I forgot to update the usage of these functions in mm-generic-cdma.c, so they were assuming failure when in fact the HDR subsystem state request was successful.
-rw-r--r--src/mm-generic-cdma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c
index 5c6af264..02d100ea 100644
--- a/src/mm-generic-cdma.c
+++ b/src/mm-generic-cdma.c
@@ -1858,9 +1858,9 @@ reg_hdrstate_cb (MMQcdmSerialPort *port,
guint8 almp_state = QCDM_CMD_HDR_SUBSYS_STATE_INFO_ALMP_STATE_INACTIVE;
guint8 hybrid_mode = 0;
- if ( qcdm_result_get_u8 (result, QCDM_CMD_HDR_SUBSYS_STATE_INFO_ITEM_SESSION_STATE, &session_state)
- && qcdm_result_get_u8 (result, QCDM_CMD_HDR_SUBSYS_STATE_INFO_ITEM_ALMP_STATE, &almp_state)
- && qcdm_result_get_u8 (result, QCDM_CMD_HDR_SUBSYS_STATE_INFO_ITEM_HDR_HYBRID_MODE, &hybrid_mode)) {
+ if ( qcdm_result_get_u8 (result, QCDM_CMD_HDR_SUBSYS_STATE_INFO_ITEM_SESSION_STATE, &session_state) == 0
+ && qcdm_result_get_u8 (result, QCDM_CMD_HDR_SUBSYS_STATE_INFO_ITEM_ALMP_STATE, &almp_state) == 0
+ && qcdm_result_get_u8 (result, QCDM_CMD_HDR_SUBSYS_STATE_INFO_ITEM_HDR_HYBRID_MODE, &hybrid_mode) == 0) {
/* EVDO state is registered if the HDR subsystem is registered, and
* we're in hybrid mode, and the Call Manager system mode is