diff --git a/drivers/debug/ftrace_ramoops.c b/drivers/debug/ftrace_ramoops.c
index 231f4239e..7d964c9fc 100644
--- a/drivers/debug/ftrace_ramoops.c
+++ b/drivers/debug/ftrace_ramoops.c
@@ -209,7 +209,7 @@ void __nocfi pstore_io_save(unsigned long reg, unsigned long val, unsigned int f
 	if (unlikely(oops_in_progress) || unlikely(per_cpu(en, cpu))) {
 		if ((flag == PSTORE_FLAG_IO_R || flag == PSTORE_FLAG_IO_W) && IRQ_D)
 			local_irq_restore(*irq_flags);
-			return;
+		return;
 	}
 
 	per_cpu(en, cpu) = 1;
diff --git a/drivers/dvb_ci/aml_ci_bus.c b/drivers/dvb_ci/aml_ci_bus.c
index 009d9e7cf..a665933ef 100644
--- a/drivers/dvb_ci/aml_ci_bus.c
+++ b/drivers/dvb_ci/aml_ci_bus.c
@@ -1840,8 +1840,8 @@ static ssize_t iotest_store(struct class *class,
 			kfree(buf_orig);
 			return size;
 		}
-	if (kstrtol(parm[1], 0, &value) == 0)
-		addr = (int)value;
+		if (kstrtol(parm[1], 0, &value) == 0)
+			addr = (int)value;
 		pr_err("%s 0x%x\n", parm[0], addr);
 		switch ((char)parm[0][1]) {
 		case 'i':
diff --git a/drivers/media/dtv_demod/dvbc/dvbc_func.c b/drivers/media/dtv_demod/dvbc/dvbc_func.c
index d6d2c4c58..f73f3a12e 100644
--- a/drivers/media/dtv_demod/dvbc/dvbc_func.c
+++ b/drivers/media/dtv_demod/dvbc/dvbc_func.c
@@ -196,8 +196,8 @@ static unsigned int fe_l2a_blind_check_agc2_bandwidth(struct aml_dtvdemod *demod
 			if (i == 44)
 				PR_DVBC("i is %d,agc2level is %d,maxagc2level is %d\n",
 						i, agc2level, maxagc2level);
-				PR_DVBC("minagc2level is %d, midagc2level is %d\n",
-						minagc2level, midagc2level);
+			PR_DVBC("minagc2level is %d, midagc2level is %d\n",
+					minagc2level, midagc2level);
 
 			if ((minagc2level > (agc2level * 2)) && i == 44)
 				agc2leveltab[k] = midagc2level;
diff --git a/drivers/media/enhancement/amdolby_vision/amdv_hw5_process.c b/drivers/media/enhancement/amdolby_vision/amdv_hw5_process.c
index e6ea4d949..4689ba25b 100644
--- a/drivers/media/enhancement/amdolby_vision/amdv_hw5_process.c
+++ b/drivers/media/enhancement/amdolby_vision/amdv_hw5_process.c
@@ -320,7 +320,7 @@ static bool prepare_parser(int reset_flag, struct video_inst_s *v_inst_info)
 				(dolby_vision_flags
 				 & FLAG_CHANGE_SEQ_HEAD
 				 ? 1 : 0);
-			p_funcs_tv->multi_mp_reset(v_inst_info->metadata_parser, 1);
+		p_funcs_tv->multi_mp_reset(v_inst_info->metadata_parser, 1);
 		} else {
 			pr_dv_dbg("p_funcs is null\n");
 		}
@@ -381,7 +381,7 @@ void update_src_format_hw5(enum signal_format_enum src_format, struct vframe_s *
 			input_str[top2_v_info.amdv_src_format],
 			vf ? vf->signal_type : 0,
 			src_format);
-			cur_format = top2_v_info.amdv_src_format;
+		cur_format = top2_v_info.amdv_src_format;
 	}
 }
 
diff --git a/sound/soc/codecs/amlogic/aml_codec_pa1.c b/sound/soc/codecs/amlogic/aml_codec_pa1.c
index 084b2938b..df22ba18f 100644
--- a/sound/soc/codecs/amlogic/aml_codec_pa1.c
+++ b/sound/soc/codecs/amlogic/aml_codec_pa1.c
@@ -512,7 +512,7 @@ static int pa1_mixer_set_3D_Surround_params(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
 	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
-	unsigned int tmp_data[PA1_FILTER_PARAM_SIZE + 1] = {0};
+	unsigned int tmp_data[PA1_FILTER_PARAM_SIZE + 2] = {0};
 	unsigned int *p_data = &tmp_data[0];
 	char tmp_string[PA1_FILTER_PARAM_BYTE];
 	char *p_string = &tmp_string[0];