diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-02 13:52:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-02 13:52:47 -0700 |
| commit | 60e9bbd784100db7db38637579aaeaf543449d44 (patch) | |
| tree | e6c000de91f8adb2b22257214dacbf35a2bd3e17 /drivers/platform/msm | |
| parent | 11b7d7db0ad2465eaa36cbb7bdf5e016b9f3b9bd (diff) | |
| parent | 915354544a814e07e6bbbd741546d0fe92d46a8f (diff) | |
Merge "msm: ipa3: Fix timeout period of IPA resource add dependency"
Diffstat (limited to 'drivers/platform/msm')
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_rm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/platform/msm/ipa/ipa_rm.c b/drivers/platform/msm/ipa/ipa_rm.c index bf6352452283..209264d69b26 100644 --- a/drivers/platform/msm/ipa/ipa_rm.c +++ b/drivers/platform/msm/ipa/ipa_rm.c @@ -267,17 +267,18 @@ static int _ipa_rm_add_dependency_sync(enum ipa_rm_resource_name resource_name, time = wait_for_completion_timeout( &((struct ipa_rm_resource_cons *)consumer)-> request_consumer_in_progress, - HZ); + HZ * 5); result = 0; if (!time) { IPA_RM_ERR("TIMEOUT waiting for %s GRANT event.", ipa_rm_resource_str(depends_on_name)); result = -ETIME; - } - IPA_RM_DBG("%s waited for %s GRANT %lu time.\n", + } else { + IPA_RM_DBG("%s waited for %s GRANT %lu time.\n", ipa_rm_resource_str(resource_name), ipa_rm_resource_str(depends_on_name), time); + } } IPA_RM_DBG("EXIT with %d\n", result); |