scsi: ufs: core: Return earlier if ufshcd_hba_init_crypto_capabilities() fails

The 'err' variable is used only as the result of
ufshcd_hba_init_crypto_capabilities(), so return 'err' immediately when
failed. If it is not an error, explicitly return 0.

Signed-off-by: Keoseong Park <keosung.park@samsung.com>
Link: https://lore.kernel.org/r/20230503104630epcms2p8b82734102ffb920531e9264604086372@epcms2p8
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 3f362232d5ee38bea2070371282654cb3946e754..fdf5073c7c6c145cc6ebf917b336c24e86cc4a53 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -2320,18 +2320,20 @@ static inline int ufshcd_hba_capabilities(struct ufs_hba *hba)
 
        /* Read crypto capabilities */
        err = ufshcd_hba_init_crypto_capabilities(hba);
-       if (err)
+       if (err) {
                dev_err(hba->dev, "crypto setup failed\n");
+               return err;
+       }
 
        hba->mcq_sup = FIELD_GET(MASK_MCQ_SUPPORT, hba->capabilities);
        if (!hba->mcq_sup)
-               return err;
+               return 0;
 
        hba->mcq_capabilities = ufshcd_readl(hba, REG_MCQCAP);
        hba->ext_iid_sup = FIELD_GET(MASK_EXT_IID_SUPPORT,
                                     hba->mcq_capabilities);
 
-       return err;
+       return 0;
 }
 
 /**