Skip to content
Snippets Groups Projects
Commit 91e5551f authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "toolbox: rmmod: fix module unloading"

parents ff856a2b fc26c0ba
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ extern int delete_module(const char *, unsigned int); ...@@ -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) ...@@ -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) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment