frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use UnloadModuleOrDriver for UnloadSubModule. 

Signed-off-by: Michal Suchanek <hramrach@centrum.cz>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Michal Suchanek 2011-10-08 14:19:34 +02:00
parent 0d4bb5442c
commit 24d435163e
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/xfree86/loader/loadmod.c
View File

@ -1072,7 +1072,10 @@ UnloadModuleOrDriver(ModuleDescPtr mod)
if (mod == NULL || mod->name == NULL) if (mod == NULL || mod->name == NULL)
return; return;
xf86MsgVerb(X_INFO, 3, "UnloadModule: \"%s\"\n", mod->name); if (mod->parent)
xf86MsgVerb(X_INFO, 3, "UnloadSubModule: \"%s\"\n", mod->name);
else
xf86MsgVerb(X_INFO, 3, "UnloadModule: \"%s\"\n", mod->name);
if ((mod->TearDownProc) && (mod->TearDownData)) if ((mod->TearDownProc) && (mod->TearDownData))
mod->TearDownProc(mod->TearDownData); mod->TearDownProc(mod->TearDownData);
@ -1092,23 +1095,8 @@ UnloadSubModule(pointer _mod)
{ {
ModuleDescPtr mod = (ModuleDescPtr)_mod; ModuleDescPtr mod = (ModuleDescPtr)_mod;
if (mod == NULL || mod->name == NULL)
return;
xf86MsgVerb(X_INFO, 3, "UnloadSubModule: \"%s\"\n", mod->name);
if ((mod->TearDownProc) && (mod->TearDownData))
mod->TearDownProc(mod->TearDownData);
LoaderUnload(mod->name, mod->handle);
RemoveChild(mod); RemoveChild(mod);
UnloadModuleOrDriver(mod);
if (mod->child)
UnloadModuleOrDriver(mod->child);
free(mod->path);
free(mod->name);
free(mod);
} }
static void static void
@ -1135,6 +1123,7 @@ RemoveChild(ModuleDescPtr child)
} }
if (mdp == child) if (mdp == child)
prevsib->sib = child->sib; prevsib->sib = child->sib;
child->sib = NULL;
return; return;
} }