From: Srinivas Kandagatla Date: Wed, 16 Jul 2014 08:18:43 +0000 (+0100) Subject: phy: qcom-apq8064: fix possible timeout without check X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=175f02ebdfdf8431dbf607c04fe5caf667ba8e6c;p=linux-beck.git 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 Signed-off-by: Srinivas Kandagatla Signed-off-by: Kishon Vijay Abraham I --- 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)