diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index fec8ed36ffa5..b238bdbe58d7 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -1489,12 +1489,20 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
 	}
 
 	hdmi->avdd_0v9 = devm_regulator_get_optional(hdmi->dev, "avdd-0v9");
-	if (IS_ERR(hdmi->avdd_0v9))
-		return PTR_ERR(hdmi->avdd_0v9);
+	if (IS_ERR(hdmi->avdd_0v9)) {
+		if (PTR_ERR(hdmi->avdd_0v9) != -ENODEV)
+			return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->avdd_0v9),
+					     "failed to get regulator: avdd-0v9\n");
+		hdmi->avdd_0v9 = NULL;
+	}
 
 	hdmi->avdd_1v8 = devm_regulator_get_optional(hdmi->dev, "avdd-1v8");
-	if (IS_ERR(hdmi->avdd_1v8))
-		return PTR_ERR(hdmi->avdd_1v8);
+	if (IS_ERR(hdmi->avdd_1v8)) {
+		if (PTR_ERR(hdmi->avdd_1v8) != -ENODEV)
+			return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->avdd_1v8),
+					     "failed to get regulator: avdd-1v8\n");
+		hdmi->avdd_1v8 = NULL;
+	}
 
 	hdmi->skip_check_420_mode =
 		of_property_read_bool(np, "skip-check-420-mode");
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index e2b4ed027a75..66b36f65a5b5 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -886,8 +886,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
 		goto unlock;
 
 	ret = property_enable(base, &rport->port_cfg->phy_sus, false);
-	if (ret)
-		goto disable_clks;
+	if (ret) {
+		clk_disable_unprepare(rphy->clk480m);
+		goto unlock;
+	}
 
 	/*
 	 * For rk3588, it needs to reset phy when exit from
@@ -900,8 +902,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
 	if (rport->port_id == USB2PHY_PORT_OTG &&
 	    of_device_is_compatible(rphy->dev->of_node, "rockchip,rk3588-usb2phy")) {
 		ret = rockchip_usb2phy_reset(rphy);
-		if (ret)
-			goto disable_clks;
+		if (ret) {
+			clk_disable_unprepare(rphy->clk480m);
+			goto unlock;
+		}
 	}
 
 	/* waiting for the utmi_clk to become stable */
@@ -909,9 +913,6 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
 
 	rport->suspended = false;
 
-disable_clks:
-	clk_disable_unprepare(rphy->clk480m);
-
 unlock:
 	mutex_unlock(&rport->mutex);
 
diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c
index ee23af609429..727a9f475e55 100644
--- a/drivers/usb/gadget/function/u_audio.c
+++ b/drivers/usb/gadget/function/u_audio.c
@@ -1284,6 +1284,7 @@ static void g_audio_work(struct work_struct *data)
 			uac_event[0] = "USB_STATE=SET_AUDIO_CLK";
 			snprintf(str, sizeof(str), "PPM=%d", audio->params.ppm);
 			uac_event[1] = str;
+			break;
 		default:
 			break;
 		}
diff --git a/scripts/Makefile b/scripts/Makefile
index 96799cc4a57f..b350de8a41ea 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -15,6 +15,7 @@ hostprogs-always-$(CONFIG_RUST)				+= generate_rust_target
 
 generate_rust_target-rust := y
 
+HOSTCFLAGS_resource_tool.o += -Wno-declaration-after-statement
 HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include
 HOSTLDLIBS_sorttable = -lpthread
 HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include