commit 18d5dd027d0f8a15bdb557bdd6859611019b0a0b
author Ben Chan <benchan@chromium.org> Mon May 06 08:12:26 2013
committer Ben Chan <benchan@chromium.org> Mon May 06 08:12:26 2013
tree 673e52f8a2d9d1e86f702130dbd7aaba3f79a152
parent 99b9d1b052edfbe6f7540e2c49925f283ed9dfef
parent 2eee2e48ba65a24b17a0b91a619027a0c6f3185a

Merge remote-tracking branch 'cros/upstream' into 'cros/master'

Change-Id: Icb3d77372eb021efa21a7d469eb9220b0efa5dcd

plugins/sierra/mm-broadband-modem-sierra.c

diff --git a/plugins/sierra/mm-broadband-modem-sierra.c b/plugins/sierra/mm-broadband-modem-sierra.c
index 7cb8e6c..f8cfb74 100644
--- a/plugins/sierra/mm-broadband-modem-sierra.c
+++ b/plugins/sierra/mm-broadband-modem-sierra.c
@@ -566,9 +566,7 @@
     if (g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &error)) {
         guint mode;
 
-        if (mm_get_uint_from_match_info (match_info, 1, &mode) &&
-            mode >= 0 &&
-            mode <= 7) {
+        if (mm_get_uint_from_match_info (match_info, 1, &mode) && mode <= 7) {
             switch (mode) {
             case 0:
                 result.allowed = MM_MODEM_MODE_ANY;

src/mm-broadband-bearer.c

diff --git a/src/mm-broadband-bearer.c b/src/mm-broadband-bearer.c
index 292420c..193f44a 100644
--- a/src/mm-broadband-bearer.c
+++ b/src/mm-broadband-bearer.c
@@ -1508,7 +1508,7 @@
                                            user_data);
 
     /* If no specific CID was used, disable all PDP contexts */
-    ctx->cgact_command = (cid >= 0 ?
+    ctx->cgact_command = (cid > 0 ?
                           g_strdup_printf ("+CGACT=0,%d", cid) :
                           g_strdup_printf ("+CGACT=0"));