nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

misc: tegra_cec: Add timeout for wait_event

Browse Source 
Bug 2151251

Change-Id: I75d16b33d1596242c28d693f824a51d72934a5c3
Signed-off-by: Aly Hirani <ahirani@nvidia.com>
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 <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vinayak Pane <vpane@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Aly Hirani
2018-06-06 16:35:14 -07:00
committed by Prafull Suryawanshi
parent 80169e7ded
commit 0e3c13c2f1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/tegra-cec/tegra_cec.c
View File

@@ -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 * this means we have to wait for it to finish before beginning
* subsequent transmission. * 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) if (ret)
return 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, writel(mask | TEGRA_CEC_INT_MASK_TX_REGISTER_EMPTY,
cec->cec_base + TEGRA_CEC_INT_MASK); 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) if (!ret)
ret = cec->tx_error; ret = cec->tx_error;