ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"

Browse source 
* commit '16d2b6ae4050b1232fd164cef1dbade532fe29a4':
  toolbox: rmmod: fix module unloading
This commit is contained in:
Jean-Baptiste Queru 2012-06-11 15:25:44 -07:00 • committed by Android Git Automerger
commit 2a2e10fbb3
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
toolbox/rmmod.c
View file

@ -10,7 +10,7 @@ extern int delete_module(const char *, unsigned int);
int rmmod_main(int argc, char **argv) int rmmod_main(int argc, char **argv)
{ {
int ret; int ret, i;
char *modname, *dot; char *modname, *dot;
/* make sure we've got an argument */ /* make sure we've got an argument */
@ -31,6 +31,15 @@ int rmmod_main(int argc, char **argv)
if (dot) if (dot)
*dot = '\0'; *dot = '\0';
/* Replace "-" with "_". This would keep rmmod
* compatible with module-init-tools version of
* rmmod
*/
for (i = 0; modname[i] != '\0'; i++) {
if (modname[i] == '-')
modname[i] = '_';
}
/* pass it to the kernel */ /* pass it to the kernel */
ret = delete_module(modname, O_NONBLOCK | O_EXCL); ret = delete_module(modname, O_NONBLOCK | O_EXCL);
if (ret != 0) { if (ret != 0) {