Skip to contentSkip to conversation

scsi: ufs: ufs-mediatek : Fix NULL vs IS_ERR checking in ufs_mtk_init_va09_pwr_ctrl

PATCH Superseded Miaoqian Lin 3 participants 4 messages Dec 22, 2021 – Jan 19, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: ufs: ufs-mediatek : Fix NULL vs IS_ERR checking in ufs_mtk_init_va09_pwr_ctrl

The function regulator_get() return error pointer, use IS_ERR() to check if has error.

---
 drivers/scsi/ufs/ufs-mediatek.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ufs/ufs-mediatek.c +1 -1
index 5393b5c9dd9c..86a938075f30 100644
@@ -557,7 +557,7 @@ static void ufs_mtk_init_va09_pwr_ctrl(struct ufs_hba *hba)
 	struct ufs_mtk_host *host = ufshcd_get_variant(hba);
 
 	host->reg_va09 = regulator_get(hba->dev, "va09");
-	if (!host->reg_va09)
+	if (IS_ERR(host->reg_va09))
 		dev_info(hba->dev, "failed to get va09");
 	else
 		host->caps |= UFS_MTK_CAP_VA09_PWR_CTRL;
Signature · 1 line
2.17.1
#1 lore raw
Quoted 5 lines · Miaoqian Lin

The function regulator_get() return error pointer, use IS_ERR() to check if has error.

Please add

Fixes cf137b3ea49a ("scsi: ufs-mediatek: Support VA09 regulator operations")

so that the patch has a chance to get picked into stable.

#2 lore raw

PATCH v2 1/1 scsi: ufs: ufs-mediatek : Fix NULL vs IS_ERR checking in ufs_mtk_init_va09_pwr_ctrl

The function regulator_get() return error pointer, use IS_ERR() to check if has error.

Fixes cf137b3ea49a ("scsi: ufs-mediatek: Support VA09 regulator operations")
---
 drivers/scsi/ufs/ufs-mediatek.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ufs/ufs-mediatek.c +1 -1
index 5393b5c9dd9c..86a938075f30 100644
@@ -557,7 +557,7 @@ static void ufs_mtk_init_va09_pwr_ctrl(struct ufs_hba *hba)
 	struct ufs_mtk_host *host = ufshcd_get_variant(hba);
 
 	host->reg_va09 = regulator_get(hba->dev, "va09");
-	if (!host->reg_va09)
+	if (IS_ERR(host->reg_va09))
 		dev_info(hba->dev, "failed to get va09");
 	else
 		host->caps |= UFS_MTK_CAP_VA09_PWR_CTRL;
Signature · 1 line
2.17.1
#3 lore raw
Quoted 4 lines · Miaoqian Lin

The function regulator_get() return error pointer, use IS_ERR() to check if has error.

Applied to 5.17/scsi-queue, thanks!

[1/1] scsi: ufs: ufs-mediatek : Fix NULL vs IS_ERR checking in ufs_mtk_init_va09_pwr_ctrl

      https://git.kernel.org/mkp/scsi/c/3ba880a12df5
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering