diff --git a/nshlib/nsh_dbgcmds.c b/nshlib/nsh_dbgcmds.c
index 94930d357..47525c25f 100644
--- a/nshlib/nsh_dbgcmds.c
+++ b/nshlib/nsh_dbgcmds.c
@@ -491,7 +491,7 @@ int cmd_hexdump(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
         }
       else
         {
-          break; // EOF
+          break; /* EOF */
         }
     }
 
diff --git a/wireless/bluetooth/btsak/btsak_gatt.c b/wireless/bluetooth/btsak/btsak_gatt.c
index 516d292b9..63b8c2c63 100644
--- a/wireless/bluetooth/btsak/btsak_gatt.c
+++ b/wireless/bluetooth/btsak/btsak_gatt.c
@@ -105,6 +105,7 @@ static void btsak_cmd_discover_common(FAR struct btsak_s *btsak,
     }
 
   ret = btsak_str2addrtype(argv[2], &btreq.btr_dpeer.type);
+  if (ret < 0)
     {
       fprintf(stderr, "ERROR:  Bad value for address type: %s\n", argv[2]);
       btsak_gatt_showusage(btsak->progname, argv[0], EXIT_FAILURE);
@@ -201,6 +202,7 @@ void btsak_cmd_gatt_exchange_mtu(FAR struct btsak_s *btsak, int argc,
     }
 
   ret = btsak_str2addrtype(argv[2], &btreq.btr_expeer.type);
+  if (ret < 0)
     {
       fprintf(stderr, "ERROR:  Bad value for address type: %s\n", argv[2]);
       btsak_gatt_showusage(btsak->progname, argv[0], EXIT_FAILURE);
@@ -414,6 +416,7 @@ void btsak_cmd_gatt_read(FAR struct btsak_s *btsak, int argc,
     }
 
   ret = btsak_str2addrtype(argv[2], &btreq.btr_rdpeer.type);
+  if (ret < 0)
     {
       fprintf(stderr, "ERROR:  Bad value for address type: %s\n", argv[2]);
       btsak_gatt_showusage(btsak->progname, argv[0], EXIT_FAILURE);
@@ -487,6 +490,7 @@ void btsak_cmd_gatt_read_multiple(FAR struct btsak_s *btsak, int argc,
     }
 
   ret = btsak_str2addrtype(argv[2], &btreq.btr_rdpeer.type);
+  if (ret < 0)
     {
       fprintf(stderr, "ERROR:  Bad value for address type: %s\n", argv[2]);
       btsak_gatt_showusage(btsak->progname, argv[0], EXIT_FAILURE);
@@ -637,6 +641,7 @@ void btsak_cmd_gatt_write(FAR struct btsak_s *btsak, int argc,
     }
 
   ret = btsak_str2addrtype(argv[2], &btreq.btr_wrpeer.type);
+  if (ret < 0)
     {
       fprintf(stderr, "ERROR:  Bad value for address type: %s\n", argv[2]);
       btsak_gatt_showusage(btsak->progname, argv[0], EXIT_FAILURE);
diff --git a/wireless/bluetooth/btsak/btsak_main.c b/wireless/bluetooth/btsak/btsak_main.c
index 010556832..6b4f8567c 100644
--- a/wireless/bluetooth/btsak/btsak_main.c
+++ b/wireless/bluetooth/btsak/btsak_main.c
@@ -572,7 +572,7 @@ int btsak_str2addr(FAR const char *str, FAR uint8_t *addr)
 
 int btsak_str2addrtype(FAR const char *str, FAR uint8_t *addrtype)
 {
-  if (!strcasecmp(str, "public") == 0)
+  if (!strcasecmp(str, "public"))
     {
       *addrtype = BT_ADDR_LE_PUBLIC;
     }
@@ -599,7 +599,7 @@ int btsak_str2addrtype(FAR const char *str, FAR uint8_t *addrtype)
 
 int btsak_str2seclevel(FAR const char *str, FAR enum bt_security_e *level)
 {
-  if (!strcasecmp(str, "low") == 0)
+  if (!strcasecmp(str, "low"))
     {
       *level = BT_SECURITY_LOW;
     }