From 0e3c13c2f1f76a98b606060b52df74a8b12d1b4f Mon Sep 17 00:00:00 2001 From: Aly Hirani Date: Wed, 6 Jun 2018 16:35:14 -0700 Subject: [PATCH] misc: tegra_cec: Add timeout for wait_event Bug 2151251 Change-Id: I75d16b33d1596242c28d693f824a51d72934a5c3 Signed-off-by: Aly Hirani Reviewed-on: https://git-master.nvidia.com/r/1742040 (cherry picked from commit c94751ec8838dd9edd5b2dafd5c308ecefe6a8b3) Reviewed-on: https://git-master.nvidia.com/r/1746695 Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: Vinayak Pane Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/misc/tegra-cec/tegra_cec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/misc/tegra-cec/tegra_cec.c b/drivers/misc/tegra-cec/tegra_cec.c index 7d7227e6..e1a0e974 100644 --- a/drivers/misc/tegra-cec/tegra_cec.c +++ b/drivers/misc/tegra-cec/tegra_cec.c @@ -124,7 +124,7 @@ int tegra_cec_native_write_l(struct tegra_cec *cec, const u8 *buf, size_t cnt) * this means we have to wait for it to finish before beginning * subsequent transmission. */ - ret = wait_event_interruptible(cec->tx_waitq, cec->tx_wake == 1); + ret = wait_event_interruptible_timeout(cec->tx_waitq, cec->tx_wake == 1, HZ); if (ret) return ret; @@ -145,7 +145,7 @@ int tegra_cec_native_write_l(struct tegra_cec *cec, const u8 *buf, size_t cnt) writel(mask | TEGRA_CEC_INT_MASK_TX_REGISTER_EMPTY, cec->cec_base + TEGRA_CEC_INT_MASK); - ret = wait_event_interruptible(cec->tx_waitq, cec->tx_wake == 1); + ret = wait_event_interruptible_timeout(cec->tx_waitq, cec->tx_wake == 1, HZ); if (!ret) ret = cec->tx_error;