]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: phy: twl6030: Fix incorrect type for ret
authorXichao Zhao <zhao.xichao@vivo.com>
Fri, 22 Aug 2025 09:22:24 +0000 (17:22 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Oct 2025 09:56:32 +0000 (11:56 +0200)
[ Upstream commit b570b346ddd727c4b41743a6a2f49e7217c5317f ]

In the twl6030_usb_probe(), the variable ret is declared as
a u32 type. However, since ret may receive -ENODEV when accepting
the return value of omap_usb2_set_comparator().Therefore, its type
should be changed to int.

Fixes: 0e98de67bacba ("usb: otg: make twl6030_usb as a comparator driver to omap_usb2")
Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
Link: https://lore.kernel.org/r/20250822092224.30645-1-zhao.xichao@vivo.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/phy/phy-twl6030-usb.c

index ab3c38a7d8ac07eb5ca50df8d0266cdcdc2b551e..a73604af8960e4e9bd60c93a976b6093aea563d6 100644 (file)
@@ -328,9 +328,8 @@ static int twl6030_set_vbus(struct phy_companion *comparator, bool enabled)
 
 static int twl6030_usb_probe(struct platform_device *pdev)
 {
-       u32 ret;
        struct twl6030_usb      *twl;
-       int                     status, err;
+       int                     status, err, ret;
        struct device_node      *np = pdev->dev.of_node;
        struct device           *dev = &pdev->dev;