aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Masters <jcm@jonmasters.org>2010-03-10 01:10:39 -0500
committerJon Masters <jcm@jonmasters.org>2010-03-10 01:10:39 -0500
commit4e746ea95820555bbe44348117cf7dec49bed376 (patch)
tree7d6b55ef347552c9d5662ba2d6a416babe6f217b
parent74efce3e06313f2a57171f75c514b2eef2a9e755 (diff)
downloadmodule-init-tools-4e746ea95820555bbe44348117cf7dec49bed376.tar.gz
modprobe: trivial cleanups post-merge of softdep bits
In order to merge in the softdep bits from alan, I wound up resetting the dev tree and remerging the whole lot. Next time, I'll just review the patches in another tree and then pull the lot, which is better. These two trivial differences were in my tree and are ok to keep. Signed-off-by: Jon Masters <jcm@jonmasters.org>
-rw-r--r--modprobe.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/modprobe.c b/modprobe.c
index 8ce1dc5..d16151a 100644
--- a/modprobe.c
+++ b/modprobe.c
@@ -1701,7 +1701,8 @@ int do_modprobe(const char *modulename,
while (aliases) {
/* Add the options for this alias. */
char *opts;
- opts = add_extra_options(modname, cmdline_opts, conf->options);
+ opts = add_extra_options(modname,
+ cmdline_opts, conf->options);
read_depends(dirname, aliases->module, &list);
failed |= handle_module(aliases->module,
@@ -1720,6 +1721,7 @@ int do_modprobe(const char *modulename,
failed |= handle_module(modname, &list, newname, cmdline_opts,
cmdline_opts, conf, dirname, error, flags);
}
+
out:
free(modname);
free_aliases(matching_aliases);