| Message ID | 20240416145233.94687-1-sebastian.reichel@collabora.com |
|---|---|
| State | Accepted |
| Commit | c9342d1a351ee1249fa98d936f756299a83d5684 |
| Headers | show |
| Series | [v1,1/1] phy: rockchip: usbdp: fix uninitialized variable | expand |
On 4/16/24 7:51 PM, Sebastian Reichel wrote: > 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> > --- > drivers/phy/rockchip/phy-rockchip-usbdp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c > index 32f306459182..2c51e5c62d3e 100644 > --- 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_phy_ops = { > 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 */
On Tue, 16 Apr 2024 16:51:23 +0200, Sebastian Reichel wrote: > 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. > > [...] Applied, thanks! [1/1] phy: rockchip: usbdp: fix uninitialized variable commit: c9342d1a351ee1249fa98d936f756299a83d5684 Best regards,
diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c index 32f306459182..2c51e5c62d3e 100644 --- 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_phy_ops = { 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 */
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> --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)