Merge "msm: ipa3: Fix timeout period of IPA resource add dependency"

This commit is contained in:
Linux Build Service Account 2016-09-02 13:52:47 -07:00 committed by Gerrit - the friendly Code Review server
commit 60e9bbd784

View file

@ -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);