diff --git a/drivers/amlogic/media/common/vpu/vpu.c b/drivers/amlogic/media/common/vpu/vpu.c
index 2bfd1a277a5d..584bf7f9e60d 100644
--- a/drivers/amlogic/media/common/vpu/vpu.c
+++ b/drivers/amlogic/media/common/vpu/vpu.c
@@ -810,7 +810,7 @@ static int get_vpu_config(struct platform_device *pdev)
 
 static void vpu_clktree_init(struct device *dev)
 {
-	static struct clk *vpu_clktree;
+	struct clk *vpu_clktree;
 
 	vpu_clktree = devm_clk_get(dev, "vapb_clk");
 	if (IS_ERR(vpu_clktree))
diff --git a/drivers/amlogic/media/common/vpu/vpu_ctrl.c b/drivers/amlogic/media/common/vpu/vpu_ctrl.c
index 74b377e6b1be..59a2922eb7a4 100644
--- a/drivers/amlogic/media/common/vpu/vpu_ctrl.c
+++ b/drivers/amlogic/media/common/vpu/vpu_ctrl.c
@@ -389,8 +389,6 @@ void switch_vpu_clk_gate_vmod(unsigned int vmod, int flag)
 			(vpu_chip_type == VPU_CHIP_GXL) ||
 			(vpu_chip_type == VPU_CHIP_GXM) ||
 			(vpu_chip_type == VPU_CHIP_TXL)) {
-			vpu_vcbus_setb(VPU_CLK_GATE, val, 8, 1); /* clkb_gen */
-			vpu_vcbus_setb(VPU_CLK_GATE, val, 9, 1); /* clkb_gen */
 			/* clkb_gen_en */
 			vpu_vcbus_setb(VPU_CLK_GATE, val, 17, 1);
 		}