[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2a5a8cf3b6eb25c4def4a03d879208e3@codeaurora.org>
Date: Mon, 21 Nov 2016 10:33:32 -0800
From: Subhash Jadavani <subhashj@...eaurora.org>
To: Bjorn Andersson <bjorn.andersson@...aro.org>
Cc: Vinayak Holikatti <vinholikatti@...il.com>,
"James E.J. Bottomley" <jejb@...ux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@...cle.com>,
Yaniv Gardi <ygardi@...eaurora.org>,
Vivek Gautam <vivek.gautam@...eaurora.org>,
linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-msm@...r.kernel.org, linux-scsi-owner@...r.kernel.org
Subject: Re: [PATCH v2] ufs: qcom: Properly clear hba priv on failure
On 2016-11-19 22:34, Bjorn Andersson wrote:
> ufs_qcom_init() sets the hba priv data before attempting to acquire the
> phy handle, so make sure to clear this in the case of an error. Failing
> to do this will make ufs_qcom_setup_clocks() operate on the
> uninitalized
> host object.
>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@...aro.org>
> ---
> drivers/scsi/ufs/ufs-qcom.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
> index d345434b084f..4de372d271b0 100644
> --- a/drivers/scsi/ufs/ufs-qcom.c
> +++ b/drivers/scsi/ufs/ufs-qcom.c
> @@ -1197,12 +1197,12 @@ static int ufs_qcom_init(struct ufs_hba *hba)
> if (IS_ERR(host->generic_phy)) {
> err = PTR_ERR(host->generic_phy);
> dev_err(dev, "%s: PHY get failed %d\n", __func__, err);
> - goto out;
> + goto out_variant_clear;
> }
>
> err = ufs_qcom_bus_register(host);
> if (err)
> - goto out_host_free;
> + goto out_variant_clear;
>
> ufs_qcom_get_controller_revision(hba, &host->hw_ver.major,
> &host->hw_ver.minor, &host->hw_ver.step);
> @@ -1267,7 +1267,7 @@ static int ufs_qcom_init(struct ufs_hba *hba)
> phy_power_off(host->generic_phy);
> out_unregister_bus:
> phy_exit(host->generic_phy);
> -out_host_free:
> +out_variant_clear:
> ufshcd_set_variant(hba, NULL);
> out:
> return err;
Looks good to me.
Reviewed-by: Subhash Jadavani <subhashj@...eaurora.org>
--
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
Powered by blists - more mailing lists