Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Chuhong Yuan <hslester96@gmail.com>
Cc:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        Chuhong Yuan <hslester96@gmail.com>
Subject: [PATCH] media: omap3isp: fix the incorrect check in omap3isp_csiphy_acquire
Date:   Thu, 19 Dec 2019 15:48:56 +0800
Message-Id: <20191219074856.15104-1-hslester96@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
To:     unlisted-recipients:; (no To-header on input)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

The check in omap3isp_csiphy_acquire() does not check for ERR_PTR.
Besides, sometimes vdd can be optional and therefore NULL.
Revise the check to fix this issue.

Fixes: 121e9f1c4c49 ("[media] omap3isp: CCP2/CSI2 receivers")
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
 drivers/media/platform/omap3isp/ispcsiphy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c b/drivers/media/platform/omap3isp/ispcsiphy.c
index 6dc7359c5131..4f46d99a4228 100644
--- a/drivers/media/platform/omap3isp/ispcsiphy.c
+++ b/drivers/media/platform/omap3isp/ispcsiphy.c
@@ -261,10 +261,10 @@ int omap3isp_csiphy_acquire(struct isp_csiphy *phy, struct media_entity *entity)
 {
 	int rval;
 
-	if (phy->vdd == NULL) {
+	if (IS_ERR(phy->vdd)) {
 		dev_err(phy->isp->dev,
 			"Power regulator for CSI PHY not available\n");
-		return -ENODEV;
+		return PTR_ERR(phy->vdd);
 	}
 
 	mutex_lock(&phy->mutex);
-- 
2.24.0