summaryrefslogtreecommitdiff
path: root/drivers/phy
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2014-07-16 12:18:43 +0400
committerKishon Vijay Abraham I <kishon@ti.com>2014-07-22 11:16:12 +0400
commit175f02ebdfdf8431dbf607c04fe5caf667ba8e6c (patch)
treebf51df06d2a44d07433a9bc4c629f2f789715cf2 /drivers/phy
parentf0ed817638b59aa927f1f7e9564dd8796b18dc4f (diff)
downloadlinux-175f02ebdfdf8431dbf607c04fe5caf667ba8e6c.tar.xz
phy: qcom-apq8064: fix possible timeout without check
This patch fixes a possible timeout in poll loop without actually checking the register before return. In theory the there is a possibility of loop being scheduled after a long lock/delay, which would then force the loop to exit without actually checking the register. Reported-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/phy-qcom-apq8064-sata.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/phy-qcom-apq8064-sata.c b/drivers/phy/phy-qcom-apq8064-sata.c
index d7c01aa1f8d7..b3ef7d805765 100644
--- a/drivers/phy/phy-qcom-apq8064-sata.c
+++ b/drivers/phy/phy-qcom-apq8064-sata.c
@@ -91,7 +91,7 @@ static int read_poll_timeout(void __iomem *addr, u32 mask)
usleep_range(DELAY_INTERVAL_US, DELAY_INTERVAL_US + 50);
} while (!time_after(jiffies, timeout));
- return -ETIMEDOUT;
+ return (readl_relaxed(addr) & mask) ? 0 : -ETIMEDOUT;
}
static int qcom_apq8064_sata_phy_init(struct phy *generic_phy)