From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C63F1C33CB1 for ; Thu, 16 Jan 2020 16:50:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92A8720663 for ; Thu, 16 Jan 2020 16:50:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193400; bh=8mMAnJ6sSB9neQCe3y0zMuhTxW55wS4PpkUYczb1s94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z8gAmAd/iozrXaWNzvXPSQN+jnRyYdEgou5ZAYMvq/0heTfjyQ9foFR4CKEauxlB3 fGqZmGwZprrDhylwVVYdpax/kPEC2tlFipu+hpXpT7VhppM7co8iWW4ZWaJIloowZE wL72rqSHt9pocz9kkWdk8mMR97vNWxXmjDawbG3I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729917AbgAPQto (ORCPT ); Thu, 16 Jan 2020 11:49:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:60600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728928AbgAPQtk (ORCPT ); Thu, 16 Jan 2020 11:49:40 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B1F9E2073A; Thu, 16 Jan 2020 16:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193379; bh=8mMAnJ6sSB9neQCe3y0zMuhTxW55wS4PpkUYczb1s94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=whs6A7FwmHhQAW2xiJuJTGRFceCE7PpWSAjFgTezX1sP/ohbEjwxRUzBblu42WfDf fJmL7fd/wlS731OLKUjgqADQQfoOwT2QF+yHCJzP6iyeoe2WkHRqrgd8ez5Do+bWIn fyVdyROtTrsTsafo6/frmy5mLkUFHYh5AM/jXxz4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Yongjun , Martin Blumenstingl , Kishon Vijay Abraham I , Sasha Levin Subject: [PATCH AUTOSEL 5.4 085/205] phy: lantiq: vrx200-pcie: fix error return code in ltq_vrx200_pcie_phy_power_on() Date: Thu, 16 Jan 2020 11:41:00 -0500 Message-Id: <20200116164300.6705-85-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116164300.6705-1-sashal@kernel.org> References: <20200116164300.6705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun [ Upstream commit 82b5d164415549e74cfa1f9156ffd4463d0a76e2 ] Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: e52a632195bf ("phy: lantiq: vrx200-pcie: add a driver for the Lantiq VRX200 PCIe PHY") Signed-off-by: Wei Yongjun Reviewed-by: Martin Blumenstingl Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Sasha Levin --- drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c b/drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c index 544d64a84cc0..6e457967653e 100644 --- a/drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c +++ b/drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c @@ -323,7 +323,8 @@ static int ltq_vrx200_pcie_phy_power_on(struct phy *phy) goto err_disable_pdi_clk; /* Check if we are in "startup ready" status */ - if (ltq_vrx200_pcie_phy_wait_for_pll(phy) != 0) + ret = ltq_vrx200_pcie_phy_wait_for_pll(phy); + if (ret) goto err_disable_phy_clk; ltq_vrx200_pcie_phy_apply_workarounds(phy); -- 2.20.1