rk2928:fix system first start the hdmi pwr mode

[firefly-linux-kernel-4.4.55.git] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index a0dbb8cc07056d297d15165f7e3537c12c034886..0b428cea2dfb7fa3a99dafca2bdbbeaf6f9f77c7 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2609,6 +2609,10 @@ static int check_module_license_and_versions(struct module *mod)
        if (strcmp(mod->name, "driverloader") == 0)
                add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
 
+       /* lve claims to be GPL but upstream won't provide source */
+       if (strcmp(mod->name, "lve") == 0)
+               add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
+
 #ifdef CONFIG_MODVERSIONS
        if ((mod->num_syms && !mod->crcs)
            || (mod->num_gpl_syms && !mod->gpl_crcs)
@@ -2827,6 +2831,13 @@ static struct module *load_module(void __user *umod,
        list_add_rcu(&mod->list, &modules);
        mutex_unlock(&module_mutex);
 
+#ifdef CONFIG_RK_CONFIG
+{
+       extern int module_parse_kernel_cmdline(const char *name, const struct kernel_param *params, unsigned num);
+       module_parse_kernel_cmdline(mod->name, mod->kp, mod->num_kp);
+}
+#endif
+
        /* Module is ready to execute: parsing args may do that. */
        err = parse_args(mod->name, mod->args, mod->kp, mod->num_kp, NULL);
        if (err < 0)