| Message ID | 20240105093703.3359949-1-yoshihiro.shimoda.uh@renesas.com |
|---|---|
| State | Accepted |
| Commit | 249abaf3bf0dd07f5ddebbb2fe2e8f4d675f074e |
| Headers | show |
| Series | phy: renesas: rcar-gen3-usb2: Fix returning wrong error code | expand |
On Fri, Jan 5, 2024 at 10:42 AM Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> wrote: > Even if device_create_file() returns error code, > rcar_gen3_phy_usb2_probe() will return zero because the "ret" is > variable shadowing. > > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <error27@gmail.com> > Closes: https://lore.kernel.org/r/202312161021.gOLDl48K-lkp@intel.com/ > Fixes: 441a681b8843 ("phy: rcar-gen3-usb2: fix implementation for runtime PM") > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
On Fri, 05 Jan 2024 18:37:03 +0900, Yoshihiro Shimoda wrote: > Even if device_create_file() returns error code, > rcar_gen3_phy_usb2_probe() will return zero because the "ret" is > variable shadowing. > > Applied, thanks! [1/1] phy: renesas: rcar-gen3-usb2: Fix returning wrong error code commit: 249abaf3bf0dd07f5ddebbb2fe2e8f4d675f074e Best regards,
diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c index e53eace7c91e..6387c0d34c55 100644 --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c @@ -673,8 +673,6 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) channel->irq = platform_get_irq_optional(pdev, 0); channel->dr_mode = rcar_gen3_get_dr_mode(dev->of_node); if (channel->dr_mode != USB_DR_MODE_UNKNOWN) { - int ret; - channel->is_otg_channel = true; channel->uses_otg_pins = !of_property_read_bool(dev->of_node, "renesas,no-otg-pins"); @@ -738,8 +736,6 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) ret = PTR_ERR(provider); goto error; } else if (channel->is_otg_channel) { - int ret; - ret = device_create_file(dev, &dev_attr_role); if (ret < 0) goto error;
Even if device_create_file() returns error code, rcar_gen3_phy_usb2_probe() will return zero because the "ret" is variable shadowing. Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <error27@gmail.com> Closes: https://lore.kernel.org/r/202312161021.gOLDl48K-lkp@intel.com/ Fixes: 441a681b8843 ("phy: rcar-gen3-usb2: fix implementation for runtime PM") Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> --- drivers/phy/renesas/phy-rcar-gen3-usb2.c | 4 ---- 1 file changed, 4 deletions(-)