mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 10:39:04 +00:00
7108f5bd9f
Backport upstreamed clk/mfd/phy/usb updates for rk3588. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org> Link: https://github.com/openwrt/openwrt/pull/16149 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From c9342d1a351ee1249fa98d936f756299a83d5684 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Reichel <sebastian.reichel@collabora.com>
|
|
Date: Tue, 16 Apr 2024 16:51:23 +0200
|
|
Subject: [PATCH] phy: rockchip: usbdp: fix uninitialized variable
|
|
|
|
The ret variable may not be initialized in rk_udphy_usb3_phy_init(), if
|
|
the PHY is not using USB3 mode.
|
|
|
|
Since the DisplayPort part is handled separately and the PHY does not
|
|
support USB2 (which is routed to another PHY on Rockchip RK3588), the
|
|
right exit code for this case is 0. Thus let's initialize the variable
|
|
accordingly.
|
|
|
|
Fixes: 2f70bbddeb457 ("phy: rockchip: add usbdp combo phy driver")
|
|
Reported-by: kernel test robot <lkp@intel.com>
|
|
Closes: https://lore.kernel.org/oe-kbuild-all/202404141048.qFAYDctQ-lkp@intel.com/
|
|
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
|
|
Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
|
|
Link: https://lore.kernel.org/r/20240416145233.94687-1-sebastian.reichel@collabora.com
|
|
Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
---
|
|
drivers/phy/rockchip/phy-rockchip-usbdp.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/phy/rockchip/phy-rockchip-usbdp.c
|
|
+++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c
|
|
@@ -1285,7 +1285,7 @@ static const struct phy_ops rk_udphy_dp_
|
|
static int rk_udphy_usb3_phy_init(struct phy *phy)
|
|
{
|
|
struct rk_udphy *udphy = phy_get_drvdata(phy);
|
|
- int ret;
|
|
+ int ret = 0;
|
|
|
|
mutex_lock(&udphy->mutex);
|
|
/* DP only or high-speed, disable U3 port */
|