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: hwdb - search parents for 'modalias' and data
[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 87a81bfaab38603ab86eecbd74f6da13050d8685..aacdff87b73690e053f16ac3a9c242f165f8f69f 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 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2011
-2012
Kay Sievers <kay.sievers@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
@@
-70,21
+70,13
@@
static void udev_kmod_log(void *data, int priority, const char *file, int line,
udev_main_log(data, priority, file, line, fn, format, args);
}
udev_main_log(data, priority, file, line, fn, format, args);
}
-/* needs to re-instantiate the context after a reload */
static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool test)
{
struct udev *udev = udev_device_get_udev(dev);
int i;
static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool test)
{
struct udev *udev = udev_device_get_udev(dev);
int i;
- if (!ctx) {
- ctx = kmod_new(NULL, NULL);
- if (!ctx)
- return -ENOMEM;
-
- log_debug("load module index\n");
- kmod_set_log_fn(ctx, udev_kmod_log, udev);
- kmod_load_resources(ctx);
- }
+ if (!ctx)
+ return 0;
if (argc < 3 || strcmp(argv[1], "load")) {
log_error("expect: %s load <module>\n", argv[0]);
if (argc < 3 || strcmp(argv[1], "load")) {
log_error("expect: %s load <module>\n", argv[0]);
@@
-99,7
+91,7
@@
static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool te
return EXIT_SUCCESS;
}
return EXIT_SUCCESS;
}
-/* called at udev startup */
+/* called at udev startup
and reload
*/
static int builtin_kmod_init(struct udev *udev)
{
if (ctx)
static int builtin_kmod_init(struct udev *udev)
{
if (ctx)
@@
-126,9
+118,9
@@
static void builtin_kmod_exit(struct udev *udev)
static bool builtin_kmod_validate(struct udev *udev)
{
log_debug("validate module index\n");
static bool builtin_kmod_validate(struct udev *udev)
{
log_debug("validate module index\n");
- if (
kmod_validate_resources(ctx) != KMOD_RESOURCES_OK
)
- return
tru
e;
- return
false
;
+ if (
!ctx
)
+ return
fals
e;
+ return
(kmod_validate_resources(ctx) != KMOD_RESOURCES_OK)
;
}
const struct udev_builtin udev_builtin_kmod = {
}
const struct udev_builtin udev_builtin_kmod = {