[PATCH v3] phy: mapphone-mdm6600: return error when timed out powering up

From: xiakaixu1987
Date: Mon Nov 16 2020 - 05:59:14 EST


From: Kaixu Xia <kaixuxia@xxxxxxxxxxx>

The value of variable error is overwritten by the following call
devm_request_threaded_irq() in phy_mdm6600_device_power_on(), actually
we should return error when timed out powering up.

Reported-by: Tosk Robot <tencent_os_robot@xxxxxxxxxxx>
Signed-off-by: Kaixu Xia <kaixuxia@xxxxxxxxxxx>
---
drivers/phy/motorola/phy-mapphone-mdm6600.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/phy/motorola/phy-mapphone-mdm6600.c b/drivers/phy/motorola/phy-mapphone-mdm6600.c
index 5172971f4c36..edbe227f47e8 100644
--- a/drivers/phy/motorola/phy-mapphone-mdm6600.c
+++ b/drivers/phy/motorola/phy-mapphone-mdm6600.c
@@ -421,8 +421,8 @@ static int phy_mdm6600_device_power_on(struct phy_mdm6600 *ddata)
dev_info(ddata->dev, "Powered up OK\n");
} else {
ddata->enabled = false;
- error = -ETIMEDOUT;
dev_err(ddata->dev, "Timed out powering up\n");
+ return -ETIMEDOUT;
}

/* Reconfigure mode1 GPIO as input for OOB wake */
--
2.20.0