diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-02 21:56:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-09-02 21:56:43 -0700 |
| commit | 4910099d3ab28deb4f7c2fd88ef5eef5362e26df (patch) | |
| tree | 4de7fc2634214ae72d7453183884b6b8b6e654be /kernel/module.c | |
| parent | 2a61e30d4462de293371173af5c153e0ea195f0e (diff) | |
| parent | 7b0c4ab61ef1dc4eaa00ee0d9b4c50ca0193ad75 (diff) | |
Merge "Merge android-4.4.188 (886d085) into msm-4.4"
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/module.c b/kernel/module.c index 57809d2b4271..ad4928210e28 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3231,8 +3231,7 @@ static bool finished_loading(const char *name) sched_annotate_sleep(); mutex_lock(&module_mutex); mod = find_module_all(name, strlen(name), true); - ret = !mod || mod->state == MODULE_STATE_LIVE - || mod->state == MODULE_STATE_GOING; + ret = !mod || mod->state == MODULE_STATE_LIVE; mutex_unlock(&module_mutex); return ret; @@ -3391,8 +3390,7 @@ again: mutex_lock(&module_mutex); old = find_module_all(mod->name, strlen(mod->name), true); if (old != NULL) { - if (old->state == MODULE_STATE_COMING - || old->state == MODULE_STATE_UNFORMED) { + if (old->state != MODULE_STATE_LIVE) { /* Wait in case it fails to load. */ mutex_unlock(&module_mutex); err = wait_event_interruptible(module_wq, |