diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-05-16 14:46:53 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-05-16 14:46:53 +0200 |
| commit | 7672135ddb9b5ca3560dd785c4772a011f1b180b (patch) | |
| tree | 3837ab37167b2e4f70634815e9d2c28950fe30f7 /drivers/base/module.c | |
| parent | 5ad8a4ddc45048bc2fe23b75357b6bf185db004f (diff) | |
| parent | 7dd7f39fce0022b386ef1ea5ffef92ecc7dfc6af (diff) | |
Merge tag 'asoc-fix-v6.15-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.15
A collection of driver specific fixes that built up over the past few
weeks, plus one core patch which fixes handling of topology files where
some DAI names are substrings of others.
Diffstat (limited to 'drivers/base/module.c')
| -rw-r--r-- | drivers/base/module.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/base/module.c b/drivers/base/module.c index 5bc71bea883a..218aaa096455 100644 --- a/drivers/base/module.c +++ b/drivers/base/module.c @@ -42,16 +42,13 @@ int module_add_driver(struct module *mod, const struct device_driver *drv) if (mod) mk = &mod->mkobj; else if (drv->mod_name) { - struct kobject *mkobj; - - /* Lookup built-in module entry in /sys/modules */ - mkobj = kset_find_obj(module_kset, drv->mod_name); - if (mkobj) { - mk = container_of(mkobj, struct module_kobject, kobj); + /* Lookup or create built-in module entry in /sys/modules */ + mk = lookup_or_create_module_kobject(drv->mod_name); + if (mk) { /* remember our module structure */ drv->p->mkobj = mk; - /* kset_find_obj took a reference */ - kobject_put(mkobj); + /* lookup_or_create_module_kobject took a reference */ + kobject_put(&mk->kobj); } } |