]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
phy: renesas: rcar-gen3-usb2: disable runtime pm in case of failure
authorWang Li <wangli74@huawei.com>
Thu, 26 Nov 2020 02:44:12 +0000 (10:44 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 10:51:19 +0000 (11:51 +0100)
[ Upstream commit 51e339deab1e51443f6ac3b1bd5cd6cc8e8fe1d9 ]

pm_runtime_enable() will decrease power disable depth. Thus a pairing
increment is needed on the error handling path to keep it balanced.

Fixes: 5d8042e95fd4 ("phy: rcar-gen3-usb2: Add support for r8a77470")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Li <wangli74@huawei.com>
Link: https://lore.kernel.org/r/20201126024412.4046845-1-wangli74@huawei.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/phy/renesas/phy-rcar-gen3-usb2.c

index 5087b7c44d55b9bb93d0749df0bc918ff8894bd8..cfb98bba7715b473dc54f61c274b1b75f372439b 100644 (file)
@@ -654,8 +654,10 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
         */
        pm_runtime_enable(dev);
        phy_usb2_ops = of_device_get_match_data(dev);
-       if (!phy_usb2_ops)
-               return -EINVAL;
+       if (!phy_usb2_ops) {
+               ret = -EINVAL;
+               goto error;
+       }
 
        mutex_init(&channel->lock);
        for (i = 0; i < NUM_OF_PHYS; i++) {