]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
phy: ti: omap-usb2: fix device leak at unbind
authorJohan Hovold <johan@kernel.org>
Thu, 24 Jul 2025 13:12:05 +0000 (15:12 +0200)
committerVinod Koul <vkoul@kernel.org>
Tue, 12 Aug 2025 16:00:00 +0000 (21:30 +0530)
Make sure to drop the reference to the control device taken by
of_find_device_by_node() during probe when the driver is unbound.

Fixes: 478b6c7436c2 ("usb: phy: omap-usb2: Don't use omap_get_control_dev()")
Cc: stable@vger.kernel.org # 3.13
Cc: Roger Quadros <rogerq@kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20250724131206.2211-3-johan@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/ti/phy-omap-usb2.c

index c1a0ef979142ceefba98e9a1291a68ebfa9abc0f..c444bb2530ca295e0d2e10fdc2fe22ab220be7e9 100644 (file)
@@ -363,6 +363,13 @@ static void omap_usb2_init_errata(struct omap_usb *phy)
                phy->flags |= OMAP_USB2_DISABLE_CHRG_DET;
 }
 
+static void omap_usb2_put_device(void *_dev)
+{
+       struct device *dev = _dev;
+
+       put_device(dev);
+}
+
 static int omap_usb2_probe(struct platform_device *pdev)
 {
        struct omap_usb *phy;
@@ -373,6 +380,7 @@ static int omap_usb2_probe(struct platform_device *pdev)
        struct device_node *control_node;
        struct platform_device *control_pdev;
        const struct usb_phy_data *phy_data;
+       int ret;
 
        phy_data = device_get_match_data(&pdev->dev);
        if (!phy_data)
@@ -423,6 +431,11 @@ static int omap_usb2_probe(struct platform_device *pdev)
                        return -EINVAL;
                }
                phy->control_dev = &control_pdev->dev;
+
+               ret = devm_add_action_or_reset(&pdev->dev, omap_usb2_put_device,
+                                              phy->control_dev);
+               if (ret)
+                       return ret;
        } else {
                if (of_property_read_u32_index(node,
                                               "syscon-phy-power", 1,