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

* commit '2a2e10fbb38e4f4d7759f619275fa4ebd596259a':
  toolbox: rmmod: fix module unloading
This commit is contained in:
Jean-Baptiste Queru 2012-06-11 15:28:12 -07:00 committed by Android Git Automerger
commit 60f3d65c83
1 changed files with 10 additions and 1 deletions

View File

@ -10,7 +10,7 @@ extern int delete_module(const char *, unsigned int);
int rmmod_main(int argc, char **argv)
{
int ret;
int ret, i;
char *modname, *dot;
/* make sure we've got an argument */
@ -31,6 +31,15 @@ int rmmod_main(int argc, char **argv)
if (dot)
*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 */
ret = delete_module(modname, O_NONBLOCK | O_EXCL);
if (ret != 0) {