Merge pull request #120 from olerem/warnings-2016.12.16

Warnings 2016.12.16
qca · Dec 16, 2016 · e997de5 · e997de5
2 parents ef9a749 + 7a22b7c
commit e997de5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c b/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c
@@ -442,7 +442,7 @@ int db_help_cmd(char *cmd, char *param1, char *param2, char *param3)
 
 static int db_ldr_cmd(char *cmd, char *param1, char *param2, char *param3)
 {
-	unsigned long val;
+	unsigned long val = 0;
 	unsigned long addr;
 	char val_str[20];
 	char addr_str[20];

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
@@ -583,14 +583,15 @@ static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
 	struct ath_hal *ah = sc->sc_ah;
 	struct ath_tx_buf *bf;
 	a_uint8_t vap_index, *anbdata;
-	ath_beacon_hdr_t *bhdr;
+	ath_beacon_hdr_t *bhdr = NULL;
 	a_uint32_t anblen;
 
 	if (!bc_hdr) {
 		adf_nbuf_peek_header(nbuf, &anbdata, &anblen);
 		bhdr = (ath_beacon_hdr_t *)anbdata;
 	} else {
 		adf_os_print("found bc_hdr! 0x%x\n", bc_hdr);
+		adf_os_assert(0);
 	}
 
 	vap_index = bhdr->vap_index;
@@ -1614,11 +1615,14 @@ static void ath_stop_tx_dma_tgt(void *Context, A_UINT16 Command,
 	struct ath_hal *ah = sc->sc_ah;
 	a_uint32_t q;
 
-	if (data)
-		q = *(a_uint32_t *)data;
+	if (!datalen)
+		goto done;
+
+	q = *(a_uint32_t *)data;
 
 	q = adf_os_ntohl(q);
 	ah->ah_stopTxDma(ah, q);
+done:
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }