chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: net_id - clarify comments
[elogind.git]
/
src
/
udev
/
udev-builtin-kmod.c
diff --git
a/src/udev/udev-builtin-kmod.c
b/src/udev/udev-builtin-kmod.c
index baf8c8c6eefc2bffb247e4d0a8c2b232c537cf7c..17aca2944d5879c4fc75d7f2d1985ad57db9ded5 100644
(file)
--- a/
src/udev/udev-builtin-kmod.c
+++ b/
src/udev/udev-builtin-kmod.c
@@
-1,7
+1,7
@@
/*
* load kernel modules
*
/*
* load kernel modules
*
- * Copyright (C) 2011-2
1012 Kay Sievers <kay.sievers
@vrfy.org>
+ * Copyright (C) 2011-2
012 Kay Sievers <kay
@vrfy.org>
* Copyright (C) 2011 ProFUSION embedded systems
*
* This program is free software: you can redistribute it and/or modify
* Copyright (C) 2011 ProFUSION embedded systems
*
* This program is free software: you can redistribute it and/or modify
@@
-39,8
+39,6
@@
static int load_module(struct udev *udev, const char *alias)
struct kmod_list *l;
int err;
struct kmod_list *l;
int err;
- assert(ctx);
-
err = kmod_module_new_from_lookup(ctx, alias, &list);
if (err < 0)
return err;
err = kmod_module_new_from_lookup(ctx, alias, &list);
if (err < 0)
return err;
@@
-77,6
+75,9
@@
static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool te
struct udev *udev = udev_device_get_udev(dev);
int i;
struct udev *udev = udev_device_get_udev(dev);
int i;
+ if (!ctx)
+ return 0;
+
if (argc < 3 || strcmp(argv[1], "load")) {
log_error("expect: %s load <module>\n", argv[0]);
return EXIT_FAILURE;
if (argc < 3 || strcmp(argv[1], "load")) {
log_error("expect: %s load <module>\n", argv[0]);
return EXIT_FAILURE;