Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1893826pxj; Sat, 5 Jun 2021 06:21:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLg8Bhzj53wI8/qsWt3dfE/G1JKHIdszP8AY+LLEIjjsST70mspnsL7lAQXKhJpxQpTTZ3 X-Received: by 2002:aa7:d304:: with SMTP id p4mr10193341edq.29.1622899298418; Sat, 05 Jun 2021 06:21:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622899298; cv=none; d=google.com; s=arc-20160816; b=UrlLeZcWgX20Wh7I2hOrto07A3xPW0q9nPi2BWtUxVF36cIJ69UCXJ3LMkixkiYbqc RUvh+yPjMeh6Fl/d27mgYSbPDm4hKsigBOXJxwKhUazv/uMUYM8kmUDEkhqWnAtroUO2 SvmvzTlH0/8cXDNDWLu8eZaXSof5AhvwZpyqwmuXNIG+1uYN6LgRH80tdalSV4GfgpAY 4uYQZnCcizW9D2q7C4uy+DUOr6MsLli3Ln7EYVpNU207w2kJcR8NdNHk81BoyhQgscNO MmT81WyUb3qf9oGmWXN2HZwcdgwoILXo67PtNzb9mENutBsOB4o/YtaHAZbBJtjtGR9+ l3pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=yV0SThrjcDQoDDZBNLsEYYtsV7yXsZO3wnaMnlW3U4g=; b=XiUe9OIUCISywRinYydCjqDYAvv0Hk9Lq6Sh+QB3vLAJFb/7lB7f33002lBw+IDfPL 5etTYuL/0QiQNlaUJbvsFLo5UTmKcjbo5pWVwGawVUIsNL7Tgw4Eqobb+eW4oY2sqerN UAjAJXJ1Zf4UbLk258Vrq/4Y0J8B5l853SzcqXs+hnsbEzT6ASJqo2neFmDSf9CC23wS LMHF46MdeKKroRH4sXCkQ0VCVTo+LS1jFiz2Cpk7C0XOOIQrnN5FZqbqe3jpQYUWPUqk TU3tBxjHMsRVhgfJifxBWExXM7M8TY12FluNubj1MtR66hcJKf9w0BNcbRAZHerKbnj9 lOdw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c7si7135093ejz.386.2021.06.05.06.21.15; Sat, 05 Jun 2021 06:21:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229978AbhFENTh (ORCPT + 99 others); Sat, 5 Jun 2021 09:19:37 -0400 Received: from smtp02.smtpout.orange.fr ([80.12.242.124]:52229 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229930AbhFENTg (ORCPT ); Sat, 5 Jun 2021 09:19:36 -0400 Received: from localhost.localdomain ([86.243.172.93]) by mwinf5d78 with ME id DRHj2500C21Fzsu03RHkfm; Sat, 05 Jun 2021 15:17:47 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 05 Jun 2021 15:17:47 +0200 X-ME-IP: 86.243.172.93 From: Christophe JAILLET To: kishon@ti.com, vkoul@kernel.org, tony@atomide.com Cc: linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] phy: ti: dm816x: Fix the error handling path in 'dm816x_usb_phy_probe() Date: Sat, 5 Jun 2021 15:17:43 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add an error handling path in the probe to release some resources, as already done in the remove function. Fixes: 609adde838f4 ("phy: Add a driver for dm816x USB PHY") Signed-off-by: Christophe JAILLET --- drivers/phy/ti/phy-dm816x-usb.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/phy/ti/phy-dm816x-usb.c b/drivers/phy/ti/phy-dm816x-usb.c index 57adc08a89b2..9fe6ea6fdae5 100644 --- a/drivers/phy/ti/phy-dm816x-usb.c +++ b/drivers/phy/ti/phy-dm816x-usb.c @@ -242,19 +242,28 @@ static int dm816x_usb_phy_probe(struct platform_device *pdev) pm_runtime_enable(phy->dev); generic_phy = devm_phy_create(phy->dev, NULL, &ops); - if (IS_ERR(generic_phy)) - return PTR_ERR(generic_phy); + if (IS_ERR(generic_phy)) { + error = PTR_ERR(generic_phy); + goto clk_unprepare; + } phy_set_drvdata(generic_phy, phy); phy_provider = devm_of_phy_provider_register(phy->dev, of_phy_simple_xlate); - if (IS_ERR(phy_provider)) - return PTR_ERR(phy_provider); + if (IS_ERR(phy_provider)) { + error = PTR_ERR(phy_provider); + goto clk_unprepare; + } usb_add_phy_dev(&phy->phy); return 0; + +clk_unprepare: + pm_runtime_disable(phy->dev); + clk_unprepare(phy->refclk); + return error; } static int dm816x_usb_phy_remove(struct platform_device *pdev) -- 2.30.2