diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-19 09:46:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-19 09:46:35 -0800 |
| commit | 5a092dc83c9502d6d33fa39f12bd4d9552d5294f (patch) | |
| tree | 2ae8dd0a250eb9bd80c07dc5fad4a4e6f3c52a50 | |
| parent | 3436baed8436f303571ed5dc0027fb9b799915bd (diff) | |
| parent | a13e78525fd08fbb489293ccc47de35bae1c6ce7 (diff) | |
Merge "msm: ipa: Do not assert if IPA FW loading fails"
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v3/ipa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa.c b/drivers/platform/msm/ipa/ipa_v3/ipa.c index e90f69b466e1..8ca42c7c2846 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa.c @@ -4116,7 +4116,7 @@ static ssize_t ipa3_write(struct file *file, const char __user *buf, if (result) { IPAERR("FW loading process has failed\n"); - BUG(); + return result; } else ipa3_post_init(&ipa3_res, ipa3_ctx->dev); } |