diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-10 04:52:45 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-10 04:52:45 +0100 |
commit | 725b5a387a392f6282756c649adf411e30535eb5 (patch) | |
tree | fd9bdbb6f0e5cb4f1b0370d14b6814b3acc40279 | |
parent | 38d3e64d2593aa5bc6bb578e1cd9a73a2d4b26fa (diff) | |
download | busybox-w32-725b5a387a392f6282756c649adf411e30535eb5.tar.gz busybox-w32-725b5a387a392f6282756c649adf411e30535eb5.tar.bz2 busybox-w32-725b5a387a392f6282756c649adf411e30535eb5.zip |
modprobe: it's not an error if module is already loaded. Closes bug 833
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | modutils/modprobe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index ca85ee76b..2860ae05d 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
@@ -290,6 +290,8 @@ static int do_modprobe(struct module_entry *m) | |||
290 | options = gather_options_str(options, G.cmdline_mopts); | 290 | options = gather_options_str(options, G.cmdline_mopts); |
291 | rc = bb_init_module(fn, options); | 291 | rc = bb_init_module(fn, options); |
292 | DBG("loaded %s '%s', rc:%d", fn, options, rc); | 292 | DBG("loaded %s '%s', rc:%d", fn, options, rc); |
293 | if (rc == EEXIST) | ||
294 | rc = 0; | ||
293 | free(options); | 295 | free(options); |
294 | if (rc) { | 296 | if (rc) { |
295 | bb_error_msg("failed to load module %s (%s): %s", | 297 | bb_error_msg("failed to load module %s (%s): %s", |