diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-12-04 00:22:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-04 00:22:02 -0800 |
| commit | 0d7730d800c20ecd7997af16a23bf883484b39d6 (patch) | |
| tree | 85c5059d8f87f5dba74c25416e9fd462772e91fd /drivers | |
| parent | 37d8265f3e3233f2a6cf3b33136ca94abc597419 (diff) | |
| parent | 8ec4a3cb24e7380f54f45ae97e1267f147c89709 (diff) | |
Merge "msm: ipa: Remove assert on ep empty"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v2/ipa.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa.c b/drivers/platform/msm/ipa/ipa_v2/ipa.c index f1e27fd3d011..1e5eda8679a5 100644 --- a/drivers/platform/msm/ipa/ipa_v2/ipa.c +++ b/drivers/platform/msm/ipa/ipa_v2/ipa.c @@ -2483,8 +2483,8 @@ check_non_ap_ep_empty: ret = 0; } else if (retry) { retry--; - usleep_range(IPA_UC_WAIT_MIN_SLEEP, - IPA_UC_WAII_MAX_SLEEP); + usleep_range(IPA_UC_WAIT_MIN_SLEEP * 5, + IPA_UC_WAII_MAX_SLEEP * 5); goto check_non_ap_ep_empty; } else { IPAERR @@ -2548,11 +2548,8 @@ int ipa_q6_post_shutdown_cleanup(void) if (res) IPAERR("ep %d not empty\n", ipa2_get_ep_mapping(client_idx)); - else - res = ipa_uc_reset_pipe(client_idx); - } else { - res = ipa_uc_reset_pipe(client_idx); } + res = ipa_uc_reset_pipe(client_idx); if (res) BUG(); } |