diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index c802014a50..63acfa3d15 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -387,7 +387,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
 	 * saved microcode information and put in the new.
 	 */
 	memset(&qe_firmware_info, 0, sizeof(qe_firmware_info));
-	strcpy(qe_firmware_info.id, firmware->id);
+	strcpy(qe_firmware_info.id, (char *)firmware->id);
 	qe_firmware_info.extended_modes = firmware->extended_modes;
 	memcpy(qe_firmware_info.vtraps, firmware->vtraps,
 		sizeof(firmware->vtraps));
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 44cbea5785..6cb25bfbc1 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -1249,6 +1249,7 @@ int uec_initialize(int index)
 	memset(uec, 0, sizeof(uec_private_t));
 
 	/* Init UEC private struct, they come from board.h */
+	uec_info = NULL;
 	if (index == 0) {
 #ifdef CONFIG_UEC_ETH1
 		uec_info = &eth1_uec_info;